Merge 26bf5f0 into 0a12ac6

LibreCat · Jun 5, 2019 · 5b6e073 · 5b6e073
2 parents 0a12ac6 + 26bf5f0
commit 5b6e073
Show file tree

Hide file tree

Showing 26 changed files with 855 additions and 312 deletions.
diff --git a/config/forms.yml b/config/forms.yml
@@ -27,6 +27,7 @@ publication_type_order:
   column_admin: []
   column_rd:
     - research_data
+    - software
 # sort order of fields for all types
 field_order:
   basic_fields:
@@ -83,6 +84,14 @@ field_order:
     - external_file
     - dropzone
     - license
+  license:
+    - ddc
+    - urn
+    - license_data
+    - has_accepted_license
+    - license_publication
+    - license_software
+    - other_data_license
   supplementary_fields:
     - article_type
     - abstract
@@ -195,9 +204,9 @@ publication_types:
         dropzone:
           mandatory: 0
         license:
-          pub_license:
+          has_accepted_license:
             mandatory: 1
-          cc_license:
+          license_publication:
             mandatory: 0
           urn:
             mandatory: 0
@@ -777,9 +786,9 @@ publication_types:
         dropzone:
           mandatory: 0
         license:
-          data_reuse_license:
+          license_data:
             mandatory: 1
-          open_data_release:
+          has_accepted_license:
             mandatory: 1
           other_data_license:
             mandatory: 0
@@ -795,6 +804,63 @@ publication_types:
           mandatory: 0
         related_material.link:
           mandatory: 0
+  software:
+    fields:
+      basic_fields:
+        document_type:
+          multiple: 0
+        doi:
+          readonly: 1
+        title:
+          mandatory: 1
+          multiple: 0
+        author:
+          mandatory: 1
+          multiple: 1
+          idm: 1
+        department:
+          multiple: 1
+        project:
+          multiple: 1
+        research_group:
+          multiple: 1
+        publisher:
+          mandatory: 1
+        year_extern:
+          year:
+            mandatory: 1
+          extern:
+            mandatory: 0
+        locked:
+          mandatory: 0
+      file_upload:
+        external_file:
+          mandatory: 0
+        dropzone:
+          mandatory: 0
+        license:
+          license_software:
+            mandatory: 1
+          has_accepted_license:
+            mandatory: 1
+          other_data_license:
+            mandatory: 0
+      supplementary_fields:
+        abstract:
+          multiple: 1
+        keyword:
+          multiple: 0
+        ddc:
+          mandatory: 0
+        jel:
+          multiple: 1
+        alternative_id:
+          multiple: 1
+      related_material:
+        related_material.rd:
+          mandatory: 0
+        related_material.link:
+          mandatory: 0
   translation:
     fields:
       basic_fields:

diff --git a/config/lists.yml b/config/lists.yml
@@ -1,10 +1,45 @@
 _prefix:
   lists:
 
-cc_licenses:
-  - cc_0
-  - cc_by
-  - cc_by_sa
+licenses:
+  publication:
+    - cc_0_1_0
+    - cc_by_4_0
+    - cc_by_sa_4_0
+    - cc_by_nd_4_0
+    - cc_by_nc_4_0
+    - cc_by_nc_sa_4_0
+    - cc_by_nc_nd_4_0
+    - cc_by_3_0
+    - cc_by_sa_3_0
+    - cc_by_nd_3_0
+    - cc_by_nc_3_0
+    - cc_by_nc_sa_3_0
+    - cc_by_nc_nd_3_0
+  theses:
+    - cc_0_1_0
+    - cc_by_4_0
+    - cc_by_sa_4_0
+    - cc_by_nc_nd_4_0
+  data:
+    - cc_0_1_0
+    - cc_by_4_0
+    - cc_by_sa_4_0
+    - cc_by_nd_4_0
+    - cc_by_nc_4_0
+    - cc_by_nc_sa_4_0
+    - cc_by_nc_nd_4_0
+    - pddl_1_0
+    - odc-by_1_0
+    - odbl_1_0
+  software:
+    - apache_2_0
+    - bsd-3-clause
+    - bsd-2-clause
+    - gpl_3_0
+    - lgpl_3_0
+    - mit
+    - mpl_2_0
 
 author_id:
   inspire: