From d6e988fc183709a9895826744aa5b8021aa1f4db Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Mon, 20 Oct 2014 19:19:43 +0000
Subject: [PATCH] Fix for the Primefaces 5.1
---
.../anl/aps/dm/portal/controllers/CrudEntityController.java | 6 +++---
.../DmWebPortal/web/templates/contentViewTemplate4x3.xhtml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/CrudEntityController.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/CrudEntityController.java
index 735273fb..d7c16fed 100644
--- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/CrudEntityController.java
+++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/CrudEntityController.java
@@ -112,9 +112,9 @@ public abstract class CrudEntityController<EntityType extends CloneableEntity, F
if (listDataTable == null) {
return false;
}
- Map<String, String> filterMap = listDataTable.getFilters();
- for (String filter : filterMap.values()) {
- if (filter != null && !filter.isEmpty()) {
+ Map<String, Object> filterMap = listDataTable.getFilters();
+ for (Object filter : filterMap.values()) {
+ if ((String)filter != null && !((String)filter).isEmpty()) {
return true;
}
}
diff --git a/src/java/DmWebPortal/web/templates/contentViewTemplate4x3.xhtml b/src/java/DmWebPortal/web/templates/contentViewTemplate4x3.xhtml
index a9cf3527..5193ff00 100644
--- a/src/java/DmWebPortal/web/templates/contentViewTemplate4x3.xhtml
+++ b/src/java/DmWebPortal/web/templates/contentViewTemplate4x3.xhtml
@@ -58,7 +58,7 @@
<p:menuitem value="Home" url="/views/home.xhtml" icon="ui-icon-home"/>
<p:menuitem value="Experiment Types" url="/views/experimentType/list.xhtml"/>
<p:menuitem value="Users" url="/views/userInfo/list.xhtml"/>
- <p:menuitem value="Login" onclick="loginDialog.show();" rendered="#{!loginController.loggedIn}" icon="ui-icon-person"/>
+ <p:menuitem value="Login" onclick="PF('loginDialog').show();" rendered="#{!loginController.loggedIn}" icon="ui-icon-person"/>
<p:menuitem value="Logout" action="#{loginController.logout()}" rendered="#{loginController.loggedIn}" icon="ui-icon-close"/> </p:menubar>
</h:form>
</ui:insert>
--
GitLab