Skip to content

Commit

Permalink
#5749 remove autoUpdate tags
Browse files Browse the repository at this point in the history
  • Loading branch information
@sekmiller
sekmiller committed Sep 9, 2019
1 parent 151b3b8 commit cb81b24
Show file tree
Hide file tree
Showing 2 changed files with 255 additions and 249 deletions.
109 changes: 56 additions & 53 deletions src/main/webapp/dataset.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -882,61 +882,64 @@
</button>
</div>
</p:dialog>
<p:outputPanel autoUpdate="true">
<p:dialog id="deaccessionBlock" rendered="#{DatasetPage.renderDeaccessionPopup}" header="#{bundle['dataset.editBtn.itemLabel.deaccession']}" widgetVar="deaccessionBlock" modal="true" visible="#{facesContext.validationFailed}">
<p:focus for="selectVersionChk"/>
<p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deaccessionDialog.tip']}</p>
<div class="form-group" jsf:rendered="#{DatasetPage.releasedVersionTabList.size() > 1}">
<label for="selectVersionChk">#{bundle['file.deaccessionDialog.reason.question1']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
<p:selectManyCheckbox id="selectVersionChk" value="#{DatasetPage.selectedDeaccessionVersions}" converter="datasetVersionConverter"
layout="pageDirection" required="#{param['DO_DEACCESSION_VALIDATION']}" requiredMessage="#{bundle['file.deaccessionDialog.dialog.selectVersion.error']}" widgetVar="selectVersionChk">
<f:selectItems value="#{DatasetPage.releasedVersionTabList}" var="versionTab" itemLabel="#{bundle['file.deaccessionDialog.version']} #{versionTab.versionNumber}.#{versionTab.minorVersionNumber}, #{versionTab.versionDate}" itemValue="#{versionTab}" />
</p:selectManyCheckbox>
<p:message for="selectVersionChk"/>
</div>
<div class="form-group">
<label for="reasonOptions">#{bundle['file.deaccessionDialog.reason.question2']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
<p:selectOneMenu widgetVar="reasonOptions" id="reasonOptions" styleClass="form-control" value="#{DatasetPage.deaccessionReasonRadio}" required="#{param['DO_DEACCESSION_VALIDATION']}"
binding="#{reasonRadio}" requiredMessage="#{bundle['file.deaccessionDialog.dialog.reason.error']}">
<f:selectItem itemLabel="#{bundle.select}" itemValue="#{null}" noSelectionOption="true" />
<f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.identifiable']}" itemValue="1" />
<f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.beRetracted']}" itemValue="2" />
<f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.beTransferred']}" itemValue="3" />
<f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.IRB']}" itemValue="4" />
<f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.legalIssue']}" itemValue="5" />
<f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.notValid']}" itemValue="6" />
<f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.other']}" itemValue="7" />
</p:selectOneMenu>
<p:message for="reasonOptions"/>
</div>
<div class="form-group">
<label for="reasonForDeaccession">
<p:fragment>
<p:autoUpdate />
<p:outputPanel>
<p:dialog id="deaccessionBlock" rendered="#{DatasetPage.renderDeaccessionPopup}" header="#{bundle['dataset.editBtn.itemLabel.deaccession']}" widgetVar="deaccessionBlock" modal="true" visible="#{facesContext.validationFailed}">
<p:focus for="selectVersionChk"/>
<p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deaccessionDialog.tip']}</p>
<div class="form-group" jsf:rendered="#{DatasetPage.releasedVersionTabList.size() > 1}">
<label for="selectVersionChk">#{bundle['file.deaccessionDialog.reason.question1']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
<p:selectManyCheckbox id="selectVersionChk" value="#{DatasetPage.selectedDeaccessionVersions}" converter="datasetVersionConverter"
layout="pageDirection" required="#{param['DO_DEACCESSION_VALIDATION']}" requiredMessage="#{bundle['file.deaccessionDialog.dialog.selectVersion.error']}" widgetVar="selectVersionChk">
<f:selectItems value="#{DatasetPage.releasedVersionTabList}" var="versionTab" itemLabel="#{bundle['file.deaccessionDialog.version']} #{versionTab.versionNumber}.#{versionTab.minorVersionNumber}, #{versionTab.versionDate}" itemValue="#{versionTab}" />
</p:selectManyCheckbox>
<p:message for="selectVersionChk"/>
</div>
<div class="form-group">
<label for="reasonOptions">#{bundle['file.deaccessionDialog.reason.question2']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
<p:selectOneMenu widgetVar="reasonOptions" id="reasonOptions" styleClass="form-control" value="#{DatasetPage.deaccessionReasonRadio}" required="#{param['DO_DEACCESSION_VALIDATION']}"
binding="#{reasonRadio}" requiredMessage="#{bundle['file.deaccessionDialog.dialog.reason.error']}">
<f:selectItem itemLabel="#{bundle.select}" itemValue="#{null}" noSelectionOption="true" />
<f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.identifiable']}" itemValue="1" />
<f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.beRetracted']}" itemValue="2" />
<f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.beTransferred']}" itemValue="3" />
<f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.IRB']}" itemValue="4" />
<f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.legalIssue']}" itemValue="5" />
<f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.notValid']}" itemValue="6" />
<f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.other']}" itemValue="7" />
</p:selectOneMenu>
<p:message for="reasonOptions"/>
</div>
<div class="form-group">
<label for="reasonForDeaccession">
#{bundle['file.deaccessionDialog.enterInfo']}
</label>
<p:inputTextarea id="reasonForDeaccession" styleClass="form-control" autoResize="false" rows="2" cols="40"
value="#{DatasetPage.deaccessionReasonText}" widgetVar="reasonForDeaccession" validator="#{DatasetPage.validateDeaccessionReason}">
<f:attribute name="reasonRadio" value="#{reasonRadio}" />
</p:inputTextarea>
<p:message for="reasonForDeaccession"/>
</div>
<div class="form-group">
<label for="forwardURLForDeaccession">
</label>
<p:inputTextarea id="reasonForDeaccession" styleClass="form-control" autoResize="false" rows="2" cols="40"
value="#{DatasetPage.deaccessionReasonText}" widgetVar="reasonForDeaccession" validator="#{DatasetPage.validateDeaccessionReason}">
<f:attribute name="reasonRadio" value="#{reasonRadio}" />
</p:inputTextarea>
<p:message for="reasonForDeaccession"/>
</div>
<div class="form-group">
<label for="forwardURLForDeaccession">
#{bundle['file.deaccessionDialog.leaveURL']}
</label>
<p:inputText id="forwardURLForDeaccession" styleClass="form-control" value="#{DatasetPage.deaccessionForwardURLFor}" widgetVar="forwardURLForDeaccession"
validator="#{DatasetPage.validateForwardURL}"/>
<p:message for="forwardURLForDeaccession"/>
<p:watermark for="forwardURLForDeaccession" value="#{bundle['file.deaccessionDialog.leaveURL.watermark']}" id="watermark" />
</div>
<div class="button-block">
<p:commandButton styleClass="btn btn-default" value="#{bundle.deaccession}"
oncomplete="if (args &amp;&amp; !args.validationFailed) PF('deaccessionConfirmation').show();">
<f:param name="DO_DEACCESSION_VALIDATION" value="true"/>
</p:commandButton>
<p:commandButton styleClass="btn btn-link" value="#{bundle.cancel}" action="#{DatasetPage.setRenderDeaccessionPopup(false)}" onclick="PF('deaccessionBlock').hide();PF('blockDatasetForm').hide();" immediate="true"/>
</div>
</p:dialog>
</p:outputPanel>
</label>
<p:inputText id="forwardURLForDeaccession" styleClass="form-control" value="#{DatasetPage.deaccessionForwardURLFor}" widgetVar="forwardURLForDeaccession"
validator="#{DatasetPage.validateForwardURL}"/>
<p:message for="forwardURLForDeaccession"/>
<p:watermark for="forwardURLForDeaccession" value="#{bundle['file.deaccessionDialog.leaveURL.watermark']}" id="watermark" />
</div>
<div class="button-block">
<p:commandButton styleClass="btn btn-default" value="#{bundle.deaccession}"
oncomplete="if (args &amp;&amp; !args.validationFailed) PF('deaccessionConfirmation').show();">
<f:param name="DO_DEACCESSION_VALIDATION" value="true"/>
</p:commandButton>
<p:commandButton styleClass="btn btn-link" value="#{bundle.cancel}" action="#{DatasetPage.setRenderDeaccessionPopup(false)}" onclick="PF('deaccessionBlock').hide();PF('blockDatasetForm').hide();" immediate="true"/>
</div>
</p:dialog>
</p:outputPanel>
</p:fragment>
<p:dialog id="deaccessionConfirmation" header="#{bundle['dataset.editBtn.itemLabel.deaccession']}" widgetVar="deaccessionConfirmation" modal="true">
<p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deaccessionDialog.deaccession.tip']}</p>
<div class="button-block">
Expand Down
Loading

0 comments on commit cb81b24

Please sign in to comment.