Skip to content

Commit

Permalink
Merge pull request #4780 from IQSS/4220-primefaces-6-2
Browse files Browse the repository at this point in the history 
4220 PrimeFaces 6.2
  • Loading branch information
@kcondon
kcondon authored Jul 16, 2018
2 parents d5016b3 + 3ae8d1c commit b73d4c4
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
<dependency>
<groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>
<version>5.3</version>
<version>6.2</version>
</dependency>
<dependency>
<groupId>org.primefaces.themes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/dataset-versions.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<!-- Retrieve version differences after the page load -->
<p:remoteCommand name="postLoadVersionTabList"
process="@this"
update=":#{p:component('versionsTable')}"
update=":#{p:resolveClientId('datasetForm:tabView:versionsTable', view)}"
actionListener="#{DatasetPage.postLoadSetVersionTabList()}" />
<div class="text-right margin-bottom">
<p:commandLink type="button" styleClass="btn btn-default" onclick="testCheckBoxes();"
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/dataset.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@
<h:inputHidden value="#{DatasetPage.lockedForAnyReason}" id="datasetLockedForAnyReasonVariable" />
<h:inputHidden value="#{DatasetPage.stateChanged}" id="datasetStateChangedVariable" />

<p:remoteCommand name="refreshAllLocksCommand" process="@this" update=":#{p:component('pageRefreshFragment')}" actionListener="#{DatasetPage.refreshAllLocks()}"/>
<p:remoteCommand name="refreshAllLocksCommand" process="@this" update=":#{p:resolveClientId('datasetForm:pageRefreshFragment', view)}" actionListener="#{DatasetPage.refreshAllLocks()}"/>
<p:remoteCommand name="refreshAllCommand" process="@this" update=":datasetForm:topDatasetBlockFragment,:datasetForm:tabView:filesTable,:messagePanel" actionListener="#{DatasetPage.refresh}"/>

<!-- see the comment in the javascript below that explains what this button is for -->
Expand Down
6 changes: 3 additions & 3 deletions src/main/webapp/editFilesFragment.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,11 +432,11 @@

<!-- Popups -->
<p:dialog styleClass="smallPopUp" header="#{bundle['file.addreplace.content_type.header']}" widgetVar="fileTypeDifferentPopup" id="fileTypeDifferentPopup" modal="true">
<p class="text-info"><span class="glyphicon glyphicon-info-sign"/> #{EditDatafilesPage.warningMessageForPopUp}</p>
<p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{EditDatafilesPage.warningMessageForPopUp}</p>
<div class="button-block">
<p:commandButton value="#{bundle['file.delete']}" onclick="PF('fileTypeDifferentPopup').hide()"
action="#{EditDatafilesPage.deleteFiles()}"
update=":#{p:component('filesTable')},:messagePanel,:#{p:component('fileUpload')},uploadMessage"/>
update=":#{p:resolveClientId('datasetForm:filesTable', view)},:messagePanel,:#{p:resolveClientId('datasetForm:fileUpload', view)},uploadMessage"/>
<p:commandButton value="#{bundle.continue}" onclick="PF('fileTypeDifferentPopup').hide()" type="button" />
</div>
</p:dialog>
Expand All @@ -448,7 +448,7 @@
</ui:fragment>
<div class="button-block">
<p:commandButton value="#{bundle.continue}" onclick="PF('deleteFileConfirmation').hide()" oncomplete="window.scrollTo(0, 0);"
update=":#{p:component('filesTable')},:messagePanel,:#{p:component('fileUpload')},uploadMessage" action="#{EditDatafilesPage.deleteFiles()}" />
update=":#{p:resolveClientId('datasetForm:filesTable', view)},:messagePanel,:#{p:resolveClientId('datasetForm:fileUpload', view)},uploadMessage" action="#{EditDatafilesPage.deleteFiles()}" />
<p:commandButton value="#{bundle.cancel}" onclick="PF('deleteFileConfirmation').hide()" type="button" />
</div>
</p:dialog>
Expand Down
24 changes: 12 additions & 12 deletions src/main/webapp/permissions-manage-files.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<p:column width="10%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.files']}">
<p:commandLink type="button" id="viewUserGroups"
actionListener="#{manageFilePermissionsPage.initAssignDialogForFileRequester(access.key)}"
update=":#{p:component('assignDialog')}"
update=":#{p:resolveClientId('rolesPermissionsForm:assignDialog', view)}"
oncomplete="PF('assignWidget').show();">
<h:outputText value="#{access.value.size()} #{access.value.size() eq 1 ? bundle['dataverse.permissionsFiles.usersOrGroups.file'] : bundle['dataverse.permissionsFiles.usersOrGroups.files']}"/>
</p:commandLink>
Expand All @@ -76,17 +76,17 @@
<div class="btn-group" role="group" aria-label="access">
<p:commandLink type="button" styleClass="btn btn-default"
actionListener="#{manageFilePermissionsPage.grantAccessToAllRequests(access.key)}"
update=":#{p:component('userGroups')} :#{p:component('restrictedFiles')} :#{p:component('fileAccessRequests')}
:#{p:component('userGroupsRequests')}
:#{p:component('userGroupMessages')} @([id$=Messages]) "
update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} :#{p:resolveClientId('rolesPermissionsForm:fileAccessRequests', view)}
:#{p:resolveClientId('rolesPermissionsForm:userGroupsRequests', view)}
:#{p:resolveClientId('rolesPermissionsForm:userGroupMessages', view)} @([id$=Messages])"
oncomplete="bind_bsui_components();">
<span class="glyphicon glyphicon-ok"/> #{bundle['dataverse.permissionsFiles.assignDialog.grantBtn']}
</p:commandLink>
<p:commandLink type="button" styleClass="btn btn-default"
actionListener="#{manageFilePermissionsPage.rejectAccessToAllRequests(access.key)}"
update=":#{p:component('userGroups')} :#{p:component('restrictedFiles')} :#{p:component('fileAccessRequests')}
:#{p:component('userGroupsRequests')}
:#{p:component('userGroupMessages')} @([id$=Messages])"
update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} :#{p:resolveClientId('rolesPermissionsForm:fileAccessRequests', view)}
:#{p:resolveClientId('rolesPermissionsForm:userGroupsRequests', view)}
:#{p:resolveClientId('rolesPermissionsForm:userGroupMessages', view)} @([id$=Messages])"
oncomplete="bind_bsui_components();">
<span class="glyphicon glyphicon-ban-circle"/> #{bundle['dataverse.permissionsFiles.assignDialog.rejectBtn']}
</p:commandLink>
Expand All @@ -111,14 +111,14 @@
<p:column width="20%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.files']}">
<p:commandLink id="viewUserGroups"
actionListener="#{manageFilePermissionsPage.initViewRemoveDialogByRoleAssignee(ra.key, ra.value)}"
update=":#{p:component('viewRemoveDialog')}"
update=":#{p:resolveClientId('rolesPermissionsForm:viewRemoveDialog', view)}"
oncomplete="PF('viewRemoveWidget').show(); bind_bsui_components();">
<h:outputText value="#{ra.value.size()} #{ra.value.size() eq 1 ? bundle['dataverse.permissionsFiles.usersOrGroups.file'] : bundle['dataverse.permissionsFiles.usersOrGroups.files']}"/>
</p:commandLink>
</p:column>
<p:column width="30%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.access']}">
<p:commandLink type="button" styleClass="btn btn-default"
update=":#{p:component('userGroups')} :#{p:component('restrictedFiles')} @([id$=Messages])"
update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} @([id$=Messages])"
actionListener="#{manageFilePermissionsPage.showUserGroupMessages}"
onclick="PF('confirmation').show()">
<f:setPropertyActionListener value="#{ra.value}" target="#{manageFilePermissionsPage.selectedRoleAssignmentRows}" />
Expand Down Expand Up @@ -178,7 +178,7 @@
<p:column width="18%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.files.tabHeader.roleAssignees']}">
<p:commandLink type="button" id="viewUserGroups" rendered="#{fileEntry.value.size() > 0}"
actionListener="#{manageFilePermissionsPage.initViewRemoveDialogByFile(fileEntry.key, fileEntry.value)}"
update=":#{p:component('viewRemoveDialog')}"
update=":#{p:resolveClientId('rolesPermissionsForm:viewRemoveDialog', view)}"
oncomplete="PF('viewRemoveWidget').show();">
<h:outputText value="#{fileEntry.value.size()} #{fileEntry.value.size() eq 1 ? bundle['dataverse.permissionsFiles.files.roleAssignee'] : bundle['dataverse.permissionsFiles.files.roleAssignees']}"/>
</p:commandLink>
Expand All @@ -187,7 +187,7 @@
<p:column width="22%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.files.tabHeader.access']}">
<p:commandLink type="button" styleClass="btn btn-default"
actionListener="#{manageFilePermissionsPage.initAssignDialogByFile(fileEntry.key)}"
update=":#{p:component('assignDialog')}"
update=":#{p:resolveClientId('rolesPermissionsForm:assignDialog', view)}"
oncomplete="PF('assignWidget').show();handleResizeDialog('assignDialog');bind_bsui_components();"><span class="glyphicon glyphicon-plus"/> #{bundle['dataverse.permissionsFiles.files.assignBtn']}</p:commandLink>
</p:column>
</p:dataTable>
Expand Down Expand Up @@ -343,7 +343,7 @@
<p:commandButton value="#{bundle.continue}" onclick="PF('confirmation').hide()"
action="#{manageFilePermissionsPage.removeRoleAssignments()}"
process="@this"
update=":#{p:component('userGroups')} :#{p:component('restrictedFiles')} @([id$=Messages])"
update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} @([id$=Messages])"
oncomplete="PF('viewRemoveWidget').hide();"/>
<p:commandButton type="button" value="#{bundle.cancel}" onclick="PF('confirmation').hide()" />
</div>
Expand Down
10 changes: 5 additions & 5 deletions src/main/webapp/permissions-manage.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
and dataverseSession.user.superuser}"
actionListener="#{managePermissionsPage.createNewRole}"
oncomplete="PF('roleForm').show();handleResizeDialog('rolesPermissionsDialog');bind_bsui_components();"
update=":#{p:component('editRolePanel')}">
update=":#{p:resolveClientId('rolesPermissionsForm:editRolePanel', view)}">
<span class="glyphicon glyphicon-plus"/> #{bundle['dataverse.permissions.roles.add']}
</p:commandLink>
</div>
Expand All @@ -176,13 +176,13 @@
and dataverseSession.user.superuser}"
actionListener="#{managePermissionsPage.editRole(role.id)}"
oncomplete="PF('roleForm').show();handleResizeDialog('rolesPermissionsDialog');"
update=":#{p:component('editRolePanel')}"><span class="glyphicon glyphicon-pencil"></span></p:commandLink>
update=":#{p:resolveClientId('rolesPermissionsForm:editRolePanel', view)}"><span class="glyphicon glyphicon-pencil"></span></p:commandLink>
<p:commandLink title="#{bundle['dataverse.permissions.roles.copy']}" styleClass="icon-inline-action bootstrap-button-tooltip"
rendered="#{managePermissionsPage.dvObject.instanceofDataverse and permissionsWrapper.canManagePermissions(managePermissionsPage.dvObject)
and dataverseSession.user.superuser}"
actionListener="#{managePermissionsPage.cloneRole(role.id)}"
oncomplete="PF('roleForm').show();handleResizeDialog('rolesPermissionsDialog');"
update=":#{p:component('editRolePanel')}"><span class="glyphicon glyphicon-duplicate"></span></p:commandLink>
update=":#{p:resolveClientId('rolesPermissionsForm:editRolePanel', view)}"><span class="glyphicon glyphicon-duplicate"></span></p:commandLink>
<div>
<ui:repeat value="#{role.permissions().toArray()}" var="prm">
<span class="label label-default">#{prm}</span>
Expand All @@ -202,7 +202,7 @@
<ui:include src="permissions-configure.xhtml"/>
<div class="button-block">
<p:commandLink value="#{bundle['saveChanges']}" styleClass="btn btn-default"
update=":#{p:component('configureSettings')} @([id$=assignedRoles]) assignedRoles @([id$=Messages])"
update=":#{p:resolveClientId('rolesPermissionsForm:configureSettings', view)} @([id$=assignedRoles]) assignedRoles @([id$=Messages])"
actionListener="#{managePermissionsPage.saveConfiguration}"
oncomplete="PF('accessForm').hide()"/>
<button type="button" class="btn btn-default" onclick="PF('accessForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
Expand All @@ -221,7 +221,7 @@
<div class="button-block">
<p:commandButton value="#{bundle.continue}" styleClass="btn btn-default" onclick="PF('confirmation').hide()"
action="#{managePermissionsPage.removeRoleAssignment()}"
update=":#{p:component('configureSettings')} assignedRoles @([id$=Messages])" />
update=":#{p:resolveClientId('rolesPermissionsForm:configureSettings', view)} assignedRoles @([id$=Messages])" />
<button type="button" class="btn btn-default" onclick="PF('confirmation').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
</div>
</p:dialog>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/search-include-fragment.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@
<h:form>
<p:remoteCommand name="postLoad"
process="@this"
update=":#{p:component('resultsTable')}"
update=":#{p:resolveClientId('resultsTable', view)}"
actionListener="#{SearchIncludeFragment.setDisplayCardValues()}" />
</h:form>

Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/themeAndWidgetsFragment.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
</ui:fragment>
</p:fragment>
<div class="button-block">
<p:commandButton class="btn btn-default" value="#{bundle.saveChanges}" update=":#{p:component('messagePanel')}, :themeWidgetsForm" action="#{themeWidgetFragment.save()}" oncomplete="bind_bsui_components();"/>
<p:commandButton class="btn btn-default" value="#{bundle.saveChanges}" update=":#{p:resolveClientId('messagePanel', view)}, :themeWidgetsForm" action="#{themeWidgetFragment.save()}" oncomplete="bind_bsui_components();"/>
<p:commandButton class="btn btn-default" action="#{themeWidgetFragment.cancel()}" immediate="true" id="themeCancel" value="#{bundle.cancel}"/>
</div>
</p:tab>
Expand Down Expand Up @@ -249,5 +249,5 @@
</ui:fragment>
</p:tab>
</p:tabView>
<p:remoteCommand name="saveRedirectUrl" process="@this" update=":#{p:component('messagePanel')}, :themeWidgetsForm, @([id$=Messages])" actionListener="#{themeWidgetFragment.save()}"/>
<p:remoteCommand name="saveRedirectUrl" process="@this" update=":#{p:resolveClientId('messagePanel', view)}, :themeWidgetsForm, @([id$=Messages])" actionListener="#{themeWidgetFragment.save()}"/>
</ui:composition>

0 comments on commit b73d4c4

Please sign in to comment.