hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 06:23:10 +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");
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);
@@ -189,7 +189,7 @@ public class CCLicenseStep extends AbstractProcessingStep
removeRequiredAttributes(session);
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);
return STATUS_COMPLETE;