hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-08 02:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

D4CRIS-338 expose the metadata section in the upload as a link to a submissionForm

Browse Source
This commit is contained in:
Andrea Bollini
2017-11-14 18:33:31 +01:00
parent bd2ba93635
commit 6e3395a997
4 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dspace-api/src/main/java/org/dspace/submit/model/UploadConfiguration.java
View File

@@ -19,7 +19,7 @@ public class UploadConfiguration<T extends SubmissionFormField>{
private ConfigurationService configurationService; private ConfigurationService configurationService;
private List<T> metadata; private String metadataDefinition;
private List<AccessConditionOption> options; private List<AccessConditionOption> options;
private Long maxSize; private Long maxSize;
private Boolean required; private Boolean required;
@@ -33,12 +33,12 @@ public class UploadConfiguration<T extends SubmissionFormField>{
this.options = options; this.options = options;
} }
public List<T> getMetadata() { public String getMetadata() {
return metadata; return metadataDefinition;
} }
public void setMetadata(List<T> metadata) { public void setMetadata(String metadata) {
this.metadata = metadata; this.metadataDefinition = metadata;
} }
public Long getMaxSize() { public Long getMaxSize() {

6
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/SubmissionUploadRest.java
View File

@@ -13,6 +13,7 @@ import java.util.List;
import org.dspace.app.rest.RestResourceController; import org.dspace.app.rest.RestResourceController;
import org.dspace.submit.model.AccessConditionOption; import org.dspace.submit.model.AccessConditionOption;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
/** /**
@@ -29,9 +30,10 @@ public class SubmissionUploadRest extends BaseObjectRest<String> {
private String name; private String name;
private List<SubmissionFormFieldRest> metadata; @JsonIgnore
private SubmissionFormRest metadata;
private List<AccessConditionOptionRest> accessConditions; private List<AccessConditionOptionRest> accessConditionOptions;
private boolean required; private boolean required;

7
dspace/config/spring/api/access-condition.xml
View File

@@ -7,12 +7,7 @@
<bean id="uploadConfigurationDefault" class="org.dspace.submit.model.UploadConfiguration"> <bean id="uploadConfigurationDefault" class="org.dspace.submit.model.UploadConfiguration">
<property name="name" value="upload"></property> <property name="name" value="upload"></property>
<property name="configurationService" ref="org.dspace.services.ConfigurationService"/> <property name="configurationService" ref="org.dspace.services.ConfigurationService"/>
<property name="metadata"> <property name="metadata" value="bitstream-metadata" />
<list>
<ref local="fieldBitstreamName"/>
<ref local="fieldBitstreamDescription"/>
</list>
</property>
<property name="options"> <property name="options">
<list> <list>
<ref local="openAccess"/> <ref local="openAccess"/>

22
dspace/config/submission-forms.xml
View File

@@ -21,6 +21,28 @@
<!-- serves as a 'this field is required' flag. --> <!-- serves as a 'this field is required' flag. -->
<form-definitions> <form-definitions>
<form name="bitstream-metadata">
<field>
<dc-schema>dc</dc-schema>
<dc-element>title</dc-element>
<dc-qualifier></dc-qualifier>
<repeatable>false</repeatable>
<label>Title</label>
<input-type>onebox</input-type>
<hint>Enter the name of the file.</hint>
<required>You must enter a main title for this item.</required>
</field>
<field>
<dc-schema>dc</dc-schema>
<dc-element>description</dc-element>
<repeatable>true</repeatable>
<label>Description</label>
<input-type>textarea</input-type>
<hint>Enter a description for the file</hint>
<required></required>
</field>
</form>
<form name="traditionalpageone"> <form name="traditionalpageone">
<field> <field>