hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 22:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-2604 fix setoptionselected for placeholder option (selectchange and nolicense options)

Browse Source
This commit is contained in:
Luigi Andrea Pascarelli
2016-09-22 23:38:37 +02:00
parent 5ba08ade7f
commit 8feb68024b
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/src/main/java/org/dspace/submit/step/CCLicenseStep.java
View File

@@ -180,7 +180,7 @@ public class CCLicenseStep extends AbstractProcessingStep
LicenseMetadataValue nameField = creativeCommonsService.getCCField("name"); LicenseMetadataValue nameField = creativeCommonsService.getCCField("name");
Item item = subInfo.getSubmissionItem().getItem(); Item item = subInfo.getSubmissionItem().getItem();
if (licenseclass.equals("webui.Submission.submit.CCLicenseStep.no_license")) if ("webui.Submission.submit.CCLicenseStep.no_license".equals(licenseclass) || "xmlui.Submission.submit.CCLicenseStep.no_license".equals(licenseclass))
{ {
creativeCommonsService.removeLicense(context, uriField, nameField, item); creativeCommonsService.removeLicense(context, uriField, nameField, item);
@@ -189,7 +189,7 @@ public class CCLicenseStep extends AbstractProcessingStep
removeRequiredAttributes(session); removeRequiredAttributes(session);
return STATUS_COMPLETE; return STATUS_COMPLETE;
} else if (StringUtils.isBlank(licenseclass) || licenseclass.equals("webui.Submission.submit.CCLicenseStep.select_change")) } else if (StringUtils.isBlank(licenseclass) || "webui.Submission.submit.CCLicenseStep.select_change".equals(licenseclass) || "xmlui.Submission.submit.CCLicenseStep.select_change".equals(licenseclass))
{ {
removeRequiredAttributes(session); removeRequiredAttributes(session);
return STATUS_COMPLETE; return STATUS_COMPLETE;

10
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/CCLicenseStep.java
View File

@@ -71,8 +71,8 @@ public class CCLicenseStep extends AbstractSubmissionStep
protected static final Message T_license = protected static final Message T_license =
message("xmlui.Submission.submit.CCLicenseStep.license"); message("xmlui.Submission.submit.CCLicenseStep.license");
protected static final Message T_submit_remove = message("xmlui.Submission.submit.CCLicenseStep.submit_remove"); protected static final Message T_submit_remove = message("xmlui.Submission.submit.CCLicenseStep.submit_remove");
protected static final Message T_no_license = message("webui.Submission.submit.CCLicenseStep.no_license","xmlui.Submission.submit.CCLicenseStep.no_license"); protected static final Message T_no_license = message("xmlui.Submission.submit.CCLicenseStep.no_license");
protected static final Message T_select_change = message("webui.Submission.submit.CCLicenseStep.select_change","xmlui.Submission.submit.CCLicenseStep.select_change"); protected static final Message T_select_change = message("xmlui.Submission.submit.CCLicenseStep.select_change");
protected static final Message T_save_changes = message("xmlui.Submission.submit.CCLicenseStep.save_changes"); protected static final Message T_save_changes = message("xmlui.Submission.submit.CCLicenseStep.save_changes");
protected static final Message T_ccws_error = message("xmlui.Submission.submit.CCLicenseStep.ccws_error"); protected static final Message T_ccws_error = message("xmlui.Submission.submit.CCLicenseStep.ccws_error");
@@ -130,6 +130,9 @@ public class CCLicenseStep extends AbstractSubmissionStep
Iterator<CCLicense> iterator = cclookup.getLicenses(ccLocale).iterator(); Iterator<CCLicense> iterator = cclookup.getLicenses(ccLocale).iterator();
// build select List - first choice always 'choose a license', last always 'No license' // build select List - first choice always 'choose a license', last always 'No license'
selectList.addOption(T_select_change.getKey(), T_select_change); selectList.addOption(T_select_change.getKey(), T_select_change);
if(T_select_change.getKey().equals(selectedLicense)) {
selectList.setOptionSelected(T_select_change.getKey());
}
while (iterator.hasNext()) { while (iterator.hasNext()) {
CCLicense cclicense = iterator.next(); CCLicense cclicense = iterator.next();
selectList.addOption(cclicense.getLicenseId(), cclicense.getLicenseName()); selectList.addOption(cclicense.getLicenseId(), cclicense.getLicenseName());
@@ -139,6 +142,9 @@ public class CCLicenseStep extends AbstractSubmissionStep
} }
} }
selectList.addOption(T_no_license.getKey(), T_no_license); selectList.addOption(T_no_license.getKey(), T_no_license);
if(T_no_license.getKey().equals(selectedLicense)) {
selectList.setOptionSelected(T_no_license.getKey());
}
if (selectedLicense != null) { if (selectedLicense != null) {
// output the license fields chooser for the license class type // output the license fields chooser for the license class type
if (cclookup.getLicenseFields(selectedLicense, ccLocale) == null ) { if (cclookup.getLicenseFields(selectedLicense, ccLocale) == null ) {