OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

remove extraneous user-list table attribute

pull/2924/head
Rigel Kent 2020-07-02 08:59:16 +02:00
parent 97990c6eb0
commit c7b836303c
No known key found for this signature in database
GPG Key ID: 5E53E96A494E452F
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/app/+admin/users/user-list/user-list.component.html
View File

@ -1,12 +1,3 @@
<div class="admin-sub-header">
<h1 i18n class="form-sub-title">Users list</h1>
<a class="add-button" routerLink="/admin/users/create">
<my-global-icon iconName="add" aria-hidden="true"></my-global-icon>
<ng-container i18n>Create user</ng-container>
</a>
</div>
<p-table <p-table
[value]="users" [lazy]="true" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions" [value]="users" [lazy]="true" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions"
[sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" [resizableColumns]="true" [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" [resizableColumns]="true"
@ -14,7 +5,6 @@
[showCurrentPageReport]="true" i18n-currentPageReportTemplate [showCurrentPageReport]="true" i18n-currentPageReportTemplate
currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} users" currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} users"
(onPage)="onPage($event)" [expandedRowKeys]="expandedRows" (onPage)="onPage($event)" [expandedRowKeys]="expandedRows"
[rowStyleClass]="getRowClasses"
> >
<ng-template pTemplate="caption"> <ng-template pTemplate="caption">
<div class="caption"> <div class="caption">
@ -26,7 +16,7 @@
</my-action-dropdown> </my-action-dropdown>
</div> </div>
<div class="has-feedback has-clear"> <div class="ml-auto has-feedback has-clear">
<input <input
type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..." type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
(keyup)="onSearch($event)" (keyup)="onSearch($event)"
@ -34,6 +24,10 @@
<a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a> <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a>
<span class="sr-only" i18n>Clear filters</span> <span class="sr-only" i18n>Clear filters</span>
</div> </div>
<a class="ml-2 add-button" routerLink="/admin/users/create">
<my-global-icon iconName="add" aria-hidden="true"></my-global-icon>
<ng-container i18n>Create user</ng-container>
</a>
</div> </div>
</ng-template> </ng-template>

6
client/src/app/+admin/users/user-list/user-list.component.ts
View File

@ -87,12 +87,6 @@ export class UserListComponent extends RestTable implements OnInit {
return 'UserListComponent' return 'UserListComponent'
} }
getRowClasses (rowData: User) {
return {
banned: rowData.blocked
}
}
openBanUserModal (users: User[]) { openBanUserModal (users: User[]) {
for (const user of users) { for (const user of users) {
if (user.username === 'root') { if (user.username === 'root') {