Skip to content
Snippets Groups Projects
Commit d6e988fc authored by Barbara B. Frosik's avatar Barbara B. Frosik
Browse files

Fix for the Primefaces 5.1

parent 907f1047
No related branches found
No related tags found
No related merge requests found
...@@ -112,9 +112,9 @@ public abstract class CrudEntityController<EntityType extends CloneableEntity, F ...@@ -112,9 +112,9 @@ public abstract class CrudEntityController<EntityType extends CloneableEntity, F
if (listDataTable == null) { if (listDataTable == null) {
return false; return false;
} }
Map<String, String> filterMap = listDataTable.getFilters(); Map<String, Object> filterMap = listDataTable.getFilters();
for (String filter : filterMap.values()) { for (Object filter : filterMap.values()) {
if (filter != null && !filter.isEmpty()) { if ((String)filter != null && !((String)filter).isEmpty()) {
return true; return true;
} }
} }
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<p:menuitem value="Home" url="/views/home.xhtml" icon="ui-icon-home"/> <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="Experiment Types" url="/views/experimentType/list.xhtml"/>
<p:menuitem value="Users" url="/views/userInfo/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> <p:menuitem value="Logout" action="#{loginController.logout()}" rendered="#{loginController.loggedIn}" icon="ui-icon-close"/> </p:menubar>
</h:form> </h:form>
</ui:insert> </ui:insert>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment