Skip to content

7565 update oncomplete #8627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kcondon merged 9 commits into from
Apr 22, 2022
Merged

7565 update oncomplete #8627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c5208e5
#7565 cleanup additional pages
sekmiller Apr 15, 2022
9d06b45
#7565 more cleanup
sekmiller Apr 15, 2022
2ccfbc8
Merge branch 'develop' into 7565-update-oncomplete
sekmiller Apr 19, 2022
81e92b9
#7565 more pages
sekmiller Apr 20, 2022
eeac1a4
#7565 still more
sekmiller Apr 20, 2022
82944bb
Merge branch 'develop' into 7565-update-oncomplete
sekmiller Apr 20, 2022
a2796c9
#7565 cleanup merge
sekmiller Apr 20, 2022
4a4e66e
#7565 fix create/edit templates
sekmiller Apr 21, 2022
512c8d9
#7565 fix messang/bundle
sekmiller Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,7 @@ public Set<ConstraintViolation> validate() {
Set<ConstraintViolation<TermsOfUseAndAccess>> constraintViolations = validator.validate(toua);
if (constraintViolations.size() > 0) {
ConstraintViolation<TermsOfUseAndAccess> violation = constraintViolations.iterator().next();
String message = BundleUtil.getStringFromBundle("toua.invalid");
String message = BundleUtil.getStringFromBundle("dataset.message.toua.invalid");
logger.info(message);
this.termsOfUseAndAccess.setValidationMessage(message);
returnSet.add(violation);
Expand Down
1 change: 1 addition & 0 deletions src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ public String init() {

if (template.getTermsOfUseAndAccess() != null) {
TermsOfUseAndAccess terms = template.getTermsOfUseAndAccess().copyTermsOfUseAndAccess();
terms.setTemplate(template);
template.setTermsOfUseAndAccess(terms);
}

Expand Down
12 changes: 9 additions & 3 deletions src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccessValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@ public boolean isValid(TermsOfUseAndAccess value, ConstraintValidatorContext con
}

public static boolean isTOUAValid(TermsOfUseAndAccess value, ConstraintValidatorContext context){
//If there are no restricted files then terms are valid

//if part of a template it is valid
if (value.getTemplate() != null){
return true;
}

//If there are no restricted files then terms are valid
if (!value.getDatasetVersion().isHasRestrictedFile()) {
return true;
}
Expand All @@ -39,10 +45,10 @@ public static boolean isTOUAValid(TermsOfUseAndAccess value, ConstraintValidator
if (!valid) {
try {
if (context != null) {
context.buildConstraintViolationWithTemplate(BundleUtil.getStringFromBundle("toua.invalid")).addConstraintViolation();
context.buildConstraintViolationWithTemplate(BundleUtil.getStringFromBundle("dataset.message.toua.invalid")).addConstraintViolation();
}

value.setValidationMessage(BundleUtil.getStringFromBundle("toua.invalid"));
value.setValidationMessage(BundleUtil.getStringFromBundle("dataset.message.toua.invalid"));
} catch (NullPointerException e) {
return false;
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/propertyFiles/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,6 +1475,7 @@ dataset.message.editMetadata.label=Edit Dataset Metadata
dataset.message.editMetadata.message=Add more metadata about this dataset to help others easily find it.
dataset.message.editMetadata.duplicateFilenames=Duplicate filenames: {0}
dataset.message.editMetadata.invalid.TOUA.message=Datasets with restricted files are required to have Request Access enabled or Terms of Access to help people access the data. Please edit the dataset to confirm Request Access or provide Terms of Access to be in compliance with the policy.
dataset.message.toua.invalid=You must enable request access or add terms of access in datasets with restricted files.

dataset.message.editTerms.label=Edit Dataset Terms
dataset.message.editTerms.message=Add the terms of use for this dataset to explain how to access and use your data.
Expand Down
22 changes: 11 additions & 11 deletions src/main/webapp/dataset-license-terms.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
jsf:rendered="#{dataverseSession.user.authenticated and empty editMode and !widgetWrapper.widgetView
and permissionsWrapper.canIssueUpdateDatasetCommand(DatasetPage.dataset)}">
<p:commandLink styleClass="btn btn-default btn-access" actionListener="#{DatasetPage.edit('LICENSE')}"
update="@form,:messagePanel" oncomplete="javascript:bind_bsui_components();" disabled="#{DatasetPage.lockedFromEdits}">
update="@form,:messagePanel" disabled="#{DatasetPage.lockedFromEdits}">
<f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
<span class="glyphicon glyphicon-briefcase"/> #{bundle['file.dataFilesTab.terms.editTermsBtn']}
</p:commandLink>
Expand Down Expand Up @@ -50,7 +50,7 @@
<c:if test="#{settingsWrapper.customLicenseAllowed}">
<f:selectItem itemLabel="#{bundle['license.custom']}" itemValue="#{null}"/>
</c:if>
<p:ajax update="touFragment" oncomplete="javascript:bind_bsui_components();" />
<p:ajax update="touFragment" />
</p:selectOneMenu>
</ui:fragment>
<ui:fragment rendered="#{!empty termsOfUseAndAccess.license}">
Expand Down Expand Up @@ -296,7 +296,7 @@
<div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}">
<p:fragment id="termsOfAccessHelp">
<ui:remove>
<ui:fragment rendered="#{!DatasetPage.dataset.editVersion.hasRestrictedFile or !DatasetPage.dataset.editVersion.termsOfUseAndAccess.fileAccessRequest}">
<ui:fragment rendered="#{datasetPage == true and (!DatasetPage.dataset.editVersion.hasRestrictedFile or !DatasetPage.dataset.editVersion.termsOfUseAndAccess.fileAccessRequest)}">
<p class="help-block">

<h:outputText value=" #{bundle['file.dataFilesTab.terms.list.termsOfAccess.description']}"/>
Expand Down Expand Up @@ -325,13 +325,13 @@
</label>
<div class="col-sm-9">
<p:selectBooleanCheckbox id="requestAccess" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}"
value="#{termsOfUseAndAccess.fileAccessRequest}" disabled="#{!DatasetPage.isHasRestrictedFiles()}">
<p:ajax event="change" update="datasetForm:saveTop,datasetForm:saveBottom,termsOfAccessHelp" />
value="#{termsOfUseAndAccess.fileAccessRequest}" disabled="#{datasetPage == true and !DatasetPage.isHasRestrictedFiles()}">
<p:ajax event="change" update="termsOfAccessHelp" />
</p:selectBooleanCheckbox>
</div>
</div>
<p:fragment id="toaValidation">
<div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{empty termsOfUseAndAccess.termsOfAccess and !termsOfUseAndAccess.fileAccessRequest}">
<div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{datasetPage == true and empty termsOfUseAndAccess.termsOfAccess and !termsOfUseAndAccess.fileAccessRequest}">
<span class="ui-message-error-detail">#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.warning.outofcompliance']}</span>
</div>
</p:fragment>
Expand All @@ -342,9 +342,9 @@
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
</label>
<div class="col-sm-9">
<p:inputTextarea id="metadata_TermsAccess" value="#{termsOfUseAndAccess.termsOfAccess}" rows="5" styleClass="form-control" disabled="#{!DatasetPage.isHasRestrictedFiles()}" >
<p:ajax event="keyup" update="datasetForm:saveTop,datasetForm:saveBottom" />
</p:inputTextarea>
<p:inputTextarea id="metadata_TermsAccess" value="#{termsOfUseAndAccess.termsOfAccess}"
rows="5" styleClass="form-control" disabled="#{datasetPage == true and !DatasetPage.isHasRestrictedFiles()}" />

</div>
</div>
<p:fragment>
Expand Down Expand Up @@ -530,7 +530,7 @@
<p:commandButton styleClass="btn btn-default pull-right"
value="#{bundle['file.dataFilesTab.terms.list.guestbook.viewBtn']}"
action="#{DatasetPage.viewSelectedGuestbook(DatasetPage.dataset.guestbook)}"
update=":datasetForm" oncomplete="PF('viewGuestbook').show();bind_bsui_components();"/>
update=":datasetForm" oncomplete="PF('viewGuestbook').show();"/>
</div>
</div>
</ui:fragment>
Expand Down Expand Up @@ -569,7 +569,7 @@
<p:commandButton styleClass="btn btn-default pull-right"
value="#{bundle['file.dataFilesTab.terms.list.guestbook.viewBtn']}"
action="#{DatasetPage.viewSelectedGuestbook(guestbook)}"
update=":datasetForm" oncomplete="PF('viewGuestbook').show();bind_bsui_components();"/>
update=":datasetForm" oncomplete="PF('viewGuestbook').show();"/>
</p:column>
</p:dataTable>
</ui:fragment>
Expand Down
18 changes: 6 additions & 12 deletions src/main/webapp/dataverse.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@
style="display:none"
process="@this :dataverseForm:selectHostDataverse"
update=":dataverseForm,:breadCrumbPanel"
action="#{DataversePage.updateOwnerDataverse()}"
oncomplete="bind_bsui_components();">
action="#{DataversePage.updateOwnerDataverse()}">
</p:commandButton>
</div>
</div>
Expand Down Expand Up @@ -221,15 +220,13 @@
<!-- Add / Remove buttons -->
<div class="col-xs-3 form-col-container field-add-delete">
<p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip" title="#{bundle.add}"
actionListener="#{DataversePage.dataverse.addDataverseContact(valCount.index + 1)}"
oncomplete="javascript:bind_bsui_components();">
actionListener="#{DataversePage.dataverse.addDataverseContact(valCount.index + 1)}">
<f:param name="SKIP_VALIDATION" value="true"/>
<h:outputText styleClass="glyphicon glyphicon-plus no-text"/>
</p:commandLink>
<p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip" title="#{bundle.delete}"
rendered="#{DataversePage.dataverse.dataverseContacts.size() > 1}"
actionListener="#{DataversePage.dataverse.removeDataverseContact(valCount.index)}"
oncomplete="javascript:bind_bsui_components();">
actionListener="#{DataversePage.dataverse.removeDataverseContact(valCount.index)}">
<f:param name="SKIP_VALIDATION" value="true"/>
<h:outputText styleClass="glyphicon glyphicon-minus no-text"/>
</p:commandLink>
Expand Down Expand Up @@ -323,16 +320,14 @@
update="@widgetVar(optionBlock)"
process="@this"
rendered="#{!mdb.showDatasetFieldTypes and (mdb.selected or mdb.required) and !DataversePage.openMetadataBlock and !DataversePage.inheritMetadataBlockFromParent}"
actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id)}"
oncomplete="javascript:bind_bsui_components();">
actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id)}">
<h:outputText value="#{bundle['dataverse.field.set.tip']}" />
</p:commandLink>
<p:commandLink id="viewDSFT" style="margin-left:1em;"
update="@widgetVar(optionBlock)"
process="@this"
rendered="#{!mdb.showDatasetFieldTypes and (!mdb.selected or DataversePage.inheritMetadataBlockFromParent) and !DataversePage.openMetadataBlock}"
actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id, false)}"
oncomplete="javascript:bind_bsui_components();">
actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id, false)}">
<h:outputText value="#{bundle['dataverse.field.set.view']}" />
</p:commandLink>
</label>
Expand Down Expand Up @@ -374,7 +369,6 @@
<p:commandLink id="hideDSFT" styleClass="btn btn-default"
process="@this @widgetVar(optionBlock)"
update="@widgetVar(optionBlock)" actionListener="#{DataversePage.hideDatasetFieldTypes(mdb.id)}"
oncomplete="javascript:bind_bsui_components();"
rendered="#{mdb.showDatasetFieldTypes}">
<h:outputText value="#{bundle.done}" />
</p:commandLink>
Expand Down Expand Up @@ -532,7 +526,7 @@
</li>
<li class="divider" role="presentation"></li>
<li>
<p:commandLink id="editInfo" actionListener="#{DataversePage.edit('INFO')}" update=":dataverseForm,:searchResults,:messagePanel" oncomplete="javascript:bind_bsui_components();">
<p:commandLink id="editInfo" actionListener="#{DataversePage.edit('INFO')}" update=":dataverseForm,:searchResults,:messagePanel">
<h:outputText value="#{bundle['dataverse.option.generalInfo']}" />
</p:commandLink>
</li>
Expand Down
9 changes: 4 additions & 5 deletions src/main/webapp/dataverseuser.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</p:panel>

<p:tabView id="dataRelatedToMeView" activeIndex="#{DataverseUserPage.activeIndex}" dynamic="true" rendered="#{empty DataverseUserPage.editMode}">
<p:ajax event="tabChange" listener="#{DataverseUserPage.onTabChange}" update="@all" oncomplete="javascript:bind_bsui_components();" />
<p:ajax event="tabChange" listener="#{DataverseUserPage.onTabChange}" update="@all" />
<p:tab id="myData" title="#{bundle['user.dataRelatedToMe']}">
<ui:include src="mydata_fragment.xhtml"></ui:include>
</p:tab>
Expand Down Expand Up @@ -369,8 +369,7 @@
</div>
<div class="notification-item-cell">
<p:commandLink title="#{bundle.removeNotification}" styleClass="bootstrap-button-tooltip"
action="#{DataverseUserPage.remove(item.id)}" update="@form"
oncomplete="bind_bsui_components();">
action="#{DataverseUserPage.remove(item.id)}" update="@form">
<span class="glyphicon glyphicon-remove"></span>
</p:commandLink>
</div>
Expand All @@ -394,13 +393,13 @@
<ui:fragment rendered="#{DataverseUserPage.passwordEditable or DataverseUserPage.accountDetailsEditable}">
<li>
<p:commandLink id="editAccount" rendered="#{DataverseUserPage.accountDetailsEditable}"
actionListener="#{DataverseUserPage.edit}" update="@form" oncomplete="javascript:bind_bsui_components();">
actionListener="#{DataverseUserPage.edit}" update="@form">
<h:outputText value="#{bundle['account.info']}" />
</p:commandLink>
</li>
<li>
<p:commandLink id="changePassword" rendered="#{DataverseUserPage.passwordEditable}"
actionListener="#{DataverseUserPage.changePassword}" update="@form" oncomplete="javascript:bind_bsui_components();">
actionListener="#{DataverseUserPage.changePassword}" update="@form">
<h:outputText value="#{bundle.passwd}" />
</p:commandLink>
</li>
Expand Down
Loading