upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-21 03:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2467 from steven-zou/master

Browse Source 
fix conflicts between 1.1.0 and master
This commit is contained in:
Daniel Jiang 2017-06-08 17:16:08 +08:00 committed by GitHub
commit 3586090bf6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ui_ng/src/app/user/user.component.html
View File

@ -12,7 +12,7 @@
</span>
</div>
<div>
<clr-datagrid>
<clr-datagrid [clrDgLoading]="inProgress">
<clr-dg-column>{{'USER.COLUMN_NAME' | translate}}</clr-dg-column>
<clr-dg-column>{{'USER.COLUMN_ADMIN' | translate}}</clr-dg-column>
<clr-dg-column>{{'USER.COLUMN_EMAIL' | translate}}</clr-dg-column>
@ -27,7 +27,10 @@
<clr-dg-cell>{{user.email}}</clr-dg-cell>
<clr-dg-cell>{{user.creation_time | date: 'short'}}</clr-dg-cell>
</clr-dg-row>
<clr-dg-footer>{{users.length}} {{'USER.ITEMS' | translate}}</clr-dg-footer>
<clr-dg-footer>{{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} of {{pagination.totalItems}} users
<clr-dg-pagination #pagination [clrDgPageSize]="15" [clrDgTotalItems]="users.length"> {{'USER.ITEMS' | translate}}
</clr-dg-pagination>
</clr-dg-footer>
</clr-datagrid>
</div>
<new-user-modal (addNew)="addUserToList($event)"></new-user-modal>

8
src/ui_ng/src/app/user/user.component.ts
View File

@ -38,10 +38,10 @@ import { AppConfigService } from '../app-config.service';
export class UserComponent implements OnInit, OnDestroy {
users: User[] = [];
originalUsers: Promise<User[]>;
onGoing: boolean = false;
adminMenuText: string = "";
adminColumn: string = "";
deletionSubscription: Subscription;
private onGoing: boolean = true;
private adminMenuText: string = "";
private adminColumn: string = "";
private deletionSubscription: Subscription;
currentTerm: string;