summaryrefslogtreecommitdiffstats
path: root/app/server-health/controllers/log-controller.html
diff options
context:
space:
mode:
authorIftekharul Islam <iffy.ryan@ibm.com>2017-08-22 13:44:38 -0500
committerAdriana Kobylak <anoo@us.ibm.com>2017-10-09 14:13:43 -0500
commit96bbf31065b3d7a27816c9344002803619d9e3fc (patch)
tree799b12ed7590c0fe0328ac37aceab45332759617 /app/server-health/controllers/log-controller.html
parentba556c310594af3daa22bc96abee55af9ce23ab2 (diff)
downloadphosphor-webui-96bbf31065b3d7a27816c9344002803619d9e3fc.tar.gz
phosphor-webui-96bbf31065b3d7a27816c9344002803619d9e3fc.zip
Updated master after merge conflicts
Change-Id: Ibea933c20071cc85201420ba1e31fedf9356f55b Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>
Diffstat (limited to 'app/server-health/controllers/log-controller.html')
-rw-r--r--app/server-health/controllers/log-controller.html4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/server-health/controllers/log-controller.html b/app/server-health/controllers/log-controller.html
index 3db7bd9..81f5f3c 100644
--- a/app/server-health/controllers/log-controller.html
+++ b/app/server-health/controllers/log-controller.html
@@ -66,7 +66,9 @@
<log-event
dir-paginate="event in (filteredLogs = (logs|filter:filterBySeverity|filter:filterByStatus|filter:filterByDate|filter:filterBySearchTerms | orderBy:'+Id'))| itemsPerPage: itemsPerPage"
event="event"
- tmz="tmz">
+ tmz="tmz"
+ multi-selected="selectedEvents.length > 1"
+ >
</log-event>
</section>
<dir-pagination-controls template-url="common/directives/dirPagination.tpl.html"></dir-pagination-controls>
OpenPOWER on IntegriCloud