From ca17cd3fe88d2b49ed694493330d5f97a1aa73ff Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Thu, 23 Oct 2014 14:32:46 +0000
Subject: [PATCH] Fixed resources
---
.../web/resources/js/experimentType/list.filter.js | 2 +-
.../DmWebPortal/web/resources/js/roleType/list.filter.js | 6 ++++++
.../DmWebPortal/web/resources/js/userInfo/list.filter.js | 2 +-
.../views/experimentType/experimentTypeDestroyDialog.xhtml | 2 +-
.../views/experimentType/experimentTypeListDataTable.xhtml | 2 +-
.../web/views/roleType/roleTypeDestroyDialog.xhtml | 2 +-
.../web/views/roleType/roleTypeListDataTable.xhtml | 2 +-
.../web/views/userInfo/userInfoDestroyDialog.xhtml | 2 +-
.../web/views/userInfo/userInfoListDataTable.xhtml | 2 +-
9 files changed, 14 insertions(+), 8 deletions(-)
create mode 100644 src/java/DmWebPortal/web/resources/js/roleType/list.filter.js
diff --git a/src/java/DmWebPortal/web/resources/js/experimentType/list.filter.js b/src/java/DmWebPortal/web/resources/js/experimentType/list.filter.js
index 70a7d2b4..ce1720c3 100644
--- a/src/java/DmWebPortal/web/resources/js/experimentType/list.filter.js
+++ b/src/java/DmWebPortal/web/resources/js/experimentType/list.filter.js
@@ -1,4 +1,4 @@
jQuery(document).ready(function() {
- experimentTypeListWidget.filter();
+ PF('experimentTypeListWidget').filter();
});
diff --git a/src/java/DmWebPortal/web/resources/js/roleType/list.filter.js b/src/java/DmWebPortal/web/resources/js/roleType/list.filter.js
new file mode 100644
index 00000000..856a9711
--- /dev/null
+++ b/src/java/DmWebPortal/web/resources/js/roleType/list.filter.js
@@ -0,0 +1,6 @@
+
+jQuery(document).ready(function() {
+ PF('roleTypeListWidget').filter();
+});
+
+
diff --git a/src/java/DmWebPortal/web/resources/js/userInfo/list.filter.js b/src/java/DmWebPortal/web/resources/js/userInfo/list.filter.js
index 491c0c3b..b7634e98 100644
--- a/src/java/DmWebPortal/web/resources/js/userInfo/list.filter.js
+++ b/src/java/DmWebPortal/web/resources/js/userInfo/list.filter.js
@@ -1,4 +1,4 @@
jQuery(document).ready(function() {
- userInfoListWidget.filter();
+ PF('userInfoListWidget').filter();
});
\ No newline at end of file
diff --git a/src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml b/src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml
index 2a297bcd..50572560 100644
--- a/src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml
@@ -8,7 +8,7 @@
header="Destroy Experiment Type" severity="alert" widgetVar="experimentTypeDestroyDialogWidget"
styleClass="dialog">
<p:commandButton value="Yes" oncomplete="experimentTypeDestroyDialogWidget.hide()" action="#{experimentTypeController.destroy()}"/>
- <p:commandButton value="No" onclick="experimentTypeDestroyDialogWidget.hide()" type="button" />
+ <p:commandButton value="No" onclick="PF('experimentTypeDestroyDialogWidget').hide()" type="button" />
</p:confirmDialog>
</ui:composition>
diff --git a/src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml b/src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml
index 9c253d48..ab7152b0 100644
--- a/src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml
@@ -42,7 +42,7 @@
<div class="actionLink">
<p:commandLink action="#{experimentTypeController.prepareView(experimentTypeObject)}" styleClass="ui-icon ui-icon-info" title="View"/>
<p:commandLink action="#{experimentTypeController.prepareEdit(experimentTypeObject)}" rendered="#{isEntityWriteable}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
- <p:commandLink oncomplete="experimentTypeDestroyDialogWidget.show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
+ <p:commandLink oncomplete="PF('experimentTypeDestroyDialogWidget').show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
<f:setPropertyActionListener value="#{experimentTypeObject}" target="#{experimentTypeController.current}"/>
</p:commandLink>
</div>
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeDestroyDialog.xhtml b/src/java/DmWebPortal/web/views/roleType/roleTypeDestroyDialog.xhtml
index 80ac67fd..88cc199a 100644
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeDestroyDialog.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeDestroyDialog.xhtml
@@ -8,6 +8,6 @@
header="Destroy RoleType" severity="alert" widgetVar="roleTypeDestroyDialogWidget"
styleClass="dialog">
<p:commandButton value="Yes" oncomplete="roleTypeDestroyDialogWidget.hide()" action="#{roleTypeController.destroy()}"/>
- <p:commandButton value="No" onclick="roleTypeDestroyDialogWidget.hide()" type="button" />
+ <p:commandButton value="No" onclick="PF('roleTypeDestroyDialogWidget').hide()" type="button" />
</p:confirmDialog>
</ui:composition>
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeListDataTable.xhtml b/src/java/DmWebPortal/web/views/roleType/roleTypeListDataTable.xhtml
index 672cf7dc..f84c579d 100644
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeListDataTable.xhtml
@@ -38,7 +38,7 @@
<div class="actionLink">
<p:commandLink action="#{roleTypeController.prepareView(roleTypeObject)}" styleClass="ui-icon ui-icon-info" title="View"/>
<p:commandLink action="#{roleTypeController.prepareEdit(roleTypeObject)}" rendered="#{isEntityWriteable}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
- <p:commandLink oncomplete="roleTypeDestroyDialogWidget.show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
+ <p:commandLink oncomplete="PF('roleTypeDestroyDialogWidget').show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
<f:setPropertyActionListener value="#{roleTypeObject}" target="#{roleTypeController.current}"/>
</p:commandLink>
</div>
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoDestroyDialog.xhtml b/src/java/DmWebPortal/web/views/userInfo/userInfoDestroyDialog.xhtml
index 4ca61537..bd51dce3 100644
--- a/src/java/DmWebPortal/web/views/userInfo/userInfoDestroyDialog.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/userInfoDestroyDialog.xhtml
@@ -8,7 +8,7 @@
header="Destroy User" severity="alert" widgetVar="userInfoDestroyDialogWidget"
styleClass="dialog">
<p:commandButton value="Yes" oncomplete="userInfoDestroyDialogWidget.hide()" action="#{userInfoController.destroy()}"/>
- <p:commandButton value="No" onclick="userInfoDestroyDialogWidget.hide()" type="button" />
+ <p:commandButton value="No" onclick="PF('userInfoDestroyDialogWidget').hide()" type="button" />
</p:confirmDialog>
</ui:composition>
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoListDataTable.xhtml b/src/java/DmWebPortal/web/views/userInfo/userInfoListDataTable.xhtml
index c6b5b928..ff53c8e5 100644
--- a/src/java/DmWebPortal/web/views/userInfo/userInfoListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/userInfoListDataTable.xhtml
@@ -57,7 +57,7 @@
<div class="actionLink">
<p:commandLink action="#{userInfoController.prepareView(userInfoObject)}" styleClass="ui-icon ui-icon-info" title="View"/>
<p:commandLink action="#{userInfoController.prepareEdit(userInfoObject)}" rendered="#{isEntityWriteable}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
- <p:commandLink oncomplete="userInfoDestroyDialogWidget.show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
+ <p:commandLink oncomplete="PF('userInfoDestroyDialogWidget').show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
<f:setPropertyActionListener value="#{userInfoObject}" target="#{userInfoController.current}"/>
</p:commandLink>
</div>
--
GitLab