Merge pull request primefaces#49 from atretyak1985/master

issues primefaces#47 & primefaces#48
Nanitor · Nov 26, 2018 · 7b3ee30 · 7b3ee30
2 parents 9f84e84 + 131fe4d
commit 7b3ee30
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/src/organization/collector/collector_list.component.ts b/src/organization/collector/collector_list.component.ts
@@ -27,7 +27,7 @@ export class CollectorListComponent implements OnInit{
     private HEADER_HEIGHT: number = 310;
     private FILTER_WIDTH: number = 300;
     private LIST_BASE_PADDING: number = 120;
-    private ROWS: number = TableCache.LIST_ROWS;
+    private ROWS: number = TableCache.PAGE_ROWS;
 
     private response: CollectorListResponse;
     private items: Array<CollectorListItem>;

diff --git a/src/organization/device/device_list_by_defences.component.html b/src/organization/device/device_list_by_defences.component.html
@@ -44,18 +44,16 @@ <h1 class="panel-title">
                                     <div class="flex-table-item md text-center"><sortable-column sortBy="sysdrive_encryption_status">Disk Encryption</sortable-column></div>
                                     <div class="flex-table-item md"><sortable-column sortBy="last_activity_at">Last Activity</sortable-column></div>
                                 </div>
-                                <div #scrollingBlock style="height: calc(100vh - 330px); overflow-y: hidden; -ms-overflow-style: -ms-autohiding-scrollbar;">
-                                    <div >
-                                        <div id="item-{{ item.id }}" class="flex-table-row tbody" *ngFor="let item of items" [attr.item-id]="item.id">
-                                            <div class="flex-table-item md"><a href="#" (click)="itemSelected($event, item)">{{ item.hostname }}</a></div>
-                                            <div class="flex-table-item md">{{ typeToString(item.type, item.system_type) }}</div>
-                                            <div class="flex-table-item md">{{ item.os_description }} {{ item.dist_version }}</div>
-                                            <div class="flex-table-item md text-center">{{ item.num_patches|mynumber }}</div>
-                                            <div class="flex-table-item md text-center">{{ avStatusToString(item.av_status) }}</div>
-                                            <div class="flex-table-item md text-center">{{ firewallStatusToString(item.firewall_status) }}</div>
-                                            <div class="flex-table-item md text-center" >{{ driveEncryptionStatusToString(item.sysdrive_encryption_status) }}</div>
-                                            <div class="flex-table-item md">{{ item.last_activity_at*1000 | moment:'MMM Do YYYY HH:mm' }}</div>
-                                        </div>
+                                <div >
+                                    <div id="item-{{ item.id }}" class="flex-table-row tbody" *ngFor="let item of items" [attr.item-id]="item.id">
+                                        <div class="flex-table-item md"><a href="#" (click)="itemSelected($event, item)">{{ item.hostname }}</a></div>
+                                        <div class="flex-table-item md">{{ typeToString(item.type, item.system_type) }}</div>
+                                        <div class="flex-table-item md">{{ item.os_description }} {{ item.dist_version }}</div>
+                                        <div class="flex-table-item md text-center">{{ item.num_patches|mynumber }}</div>
+                                        <div class="flex-table-item md text-center">{{ avStatusToString(item.av_status) }}</div>
+                                        <div class="flex-table-item md text-center">{{ firewallStatusToString(item.firewall_status) }}</div>
+                                        <div class="flex-table-item md text-center" >{{ driveEncryptionStatusToString(item.sysdrive_encryption_status) }}</div>
+                                        <div class="flex-table-item md">{{ item.last_activity_at*1000 | moment:'MMM Do YYYY HH:mm' }}</div>
                                     </div>
                                 </div>
                             </div>

diff --git a/src/organization/loggedin_user/loggedin_user_list.component.html b/src/organization/loggedin_user/loggedin_user_list.component.html
@@ -68,7 +68,7 @@ <h1 class="panel-title">
                                     <td class="table-cell" [ngStyle]="{'width': getColumnWidth('num_devices_remoteallowed')}">{{ rowData.num_devices_remoteallowed }}</td>
                                     <td class="table-cell" [ngStyle]="{'width': getColumnWidth('last_activity_at')}">{{ rowData.last_activity_at*1000 | moment:'MMM Do YYYY HH:mm' }}</td>
                                     <td *ngIf="rowData.last_logon_time != null" class="table-cell" [ngStyle]="{'width': getColumnWidth('last_logon_time')}">{{  rowData.last_logon_time*1000 | moment:'MMM Do YYYY HH:mm' }}</td>
-                                    <td *ngIf="rowData.last_logon_time == null" class="table-cell" [ngStyle]="{'width': getColumnWidth('num_devices')}"></td>
+                                    <td *ngIf="rowData.last_logon_time == null" class="table-cell" [ngStyle]="{'width': getColumnWidth('last_logon_time')}"></td>
                                 </tr>
                             </ng-template>
                         </p-table>

diff --git a/src/organization/software/software_list.component.ts b/src/organization/software/software_list.component.ts
@@ -26,7 +26,7 @@ export class SoftwareListComponent implements OnInit{
     private HEADER_HEIGHT: number = 310;
     private FILTER_WIDTH: number = 300;
     private LIST_BASE_PADDING: number = 120;
-    private ROWS: number = TableCache.LIST_ROWS;
+    private ROWS: number = TableCache.PAGE_ROWS;
 
     private response: SoftwareListResponse;
     private items: Array<SoftwareListItem>;