diff --git a/dashboard/portal/portals.component.html b/dashboard/portal/portals.component.html index 9f57de8c..6910431c 100644 --- a/dashboard/portal/portals.component.html +++ b/dashboard/portal/portals.component.html @@ -55,11 +55,11 @@ Bulk Actions ({{getSelectedPortals().length}})
-
@@ -67,6 +67,7 @@ Name Type + Piwik Actions @@ -81,6 +82,9 @@
{{check.portal.type}}
+ +
{{check.portal.piwik}}
+
diff --git a/dashboard/portal/portals.component.ts b/dashboard/portal/portals.component.ts index be2ed599..d9dec3ec 100644 --- a/dashboard/portal/portals.component.ts +++ b/dashboard/portal/portals.component.ts @@ -229,11 +229,11 @@ export class PortalsComponent implements OnInit { public filterByType(portal: Portal): boolean { let type = this.filterForm.get("type").value; - return type == "all" || (type == portal.type); + return type == "all" || (type === portal.type); } public filterPortals(portal: Portal): boolean { - return this.searchText.toString() === '' || (portal.name || portal.type).match(this.searchText) != null; + return this.searchText.toString() === '' || (portal.name + portal.type + portal.pid).match(this.searchText) != null; } handleUpdateError(message: string, error = null) {