ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor bugfix

Browse Source
This commit is contained in:
leejinho 2020-04-02 18:12:27 +09:00
parent a1a210b63d
commit 89a99d20d3
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization-tree.component.spec.ts
View File

@ -1,19 +1,19 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrganizationComponent } from './organization.component'; import { OrganizationTreeComponent } from './organization-tree.component';
describe('Chat::LeftSidenav::OrganizationComponent', () => { describe('Chat::LeftSidenav::OrganizationTreeComponent', () => {
let component: OrganizationComponent; let component: OrganizationTreeComponent;
let fixture: ComponentFixture<OrganizationComponent>; let fixture: ComponentFixture<OrganizationTreeComponent>;
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [OrganizationComponent] declarations: [OrganizationTreeComponent]
}).compileComponents(); }).compileComponents();
})); }));
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(OrganizationComponent); fixture = TestBed.createComponent(OrganizationTreeComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });

30
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.html
View File

@ -18,7 +18,11 @@
<ng-container *ngIf="!!isSearch">{{ <ng-container *ngIf="!!isSearch">{{
'common.searchResult' | translate 'common.searchResult' | translate
}}</ng-container }}</ng-container
><span class="text-accent-color person-count" ><span
class="text-accent-color person-count"
*ngIf="
!!departmentUserInfoList && departmentUserInfoList.length > 0
"
>({{ departmentUserInfoList.length >({{ departmentUserInfoList.length
}}{{ 'common.units.persons' | translate }})</span }}{{ 'common.units.persons' | translate }})</span
> >
@ -222,7 +226,11 @@
<li> <li>
<button <button
mat-flat-button mat-flat-button
[disabled]="selectedUserList.length > 0 ? 'false' : 'true'" [disabled]="
!!selectedUserList && selectedUserList.length > 0
? 'false'
: 'true'
"
(click)="onClickAddGroup()" (click)="onClickAddGroup()"
class="mat-primary" class="mat-primary"
> >
@ -232,7 +240,11 @@
<li> <li>
<button <button
mat-flat-button mat-flat-button
[disabled]="selectedUserList.length > 0 ? 'false' : 'true'" [disabled]="
!!selectedUserList && selectedUserList.length > 0
? 'false'
: 'true'
"
(click)="onClickChatOpen()" (click)="onClickChatOpen()"
class="mat-primary" class="mat-primary"
> >
@ -242,7 +254,11 @@
<li *ngIf="!!authInfo && authInfo.canVideoConference"> <li *ngIf="!!authInfo && authInfo.canVideoConference">
<button <button
mat-flat-button mat-flat-button
[disabled]="selectedUserList.length > 0 ? 'false' : 'true'" [disabled]="
!!selectedUserList && selectedUserList.length > 0
? 'false'
: 'true'
"
(click)="onClickConference()" (click)="onClickConference()"
class="mat-primary" class="mat-primary"
> >
@ -252,7 +268,11 @@
<li> <li>
<button <button
mat-flat-button mat-flat-button
[disabled]="selectedUserList.length > 0 ? 'false' : 'true'" [disabled]="
!!selectedUserList && selectedUserList.length > 0
? 'false'
: 'true'
"
(click)="onClickMessage()" (click)="onClickMessage()"
class="mat-primary" class="mat-primary"
> >