[wip]

app/views/works/_additional_form.html.erb

@@ -1,24 +1,4 @@
 <div class="section-title">
-  <div class="field">
-    Publisher:<span class="required-field">*</span><br>
-    <input type="text" id="publisher" name="publisher" class="input-text-long" value="<%= @work.resource.publisher %>" />
-  </div>
-
-  <div class="field">
-    Publication Year:<span class="required-field">*</span><br>
-    <input type="text" id="publication_year" name="publication_year" class="input-text-year" value="<%= @work.resource.publication_year %>" />
-  </div>
-
-  <!-- Collection field -->
-  <div class="field">
-    Collection: <span class="required-field">*</span><br>
-    <select id="collection_id" name="collection_id" class="input-text-long" >
-      <% current_user.submitter_collections.each do |collection| %>
-        <option value="<%=collection.id%>" <%= @work.collection_id == collection.id ? "selected" : "" %>><%=collection.title%></option>
-      <% end %>
-    </select>
-  </div>
-
   <!-- Keywords field -->
   <div class="field">
     Keywords: <span class="text-muted field-hint">(enter keywords, e.g. Humanities, Life Sciences)</span><br>

app/views/works/_curator_controlled_display.html.erb

@@ -1,4 +1,16 @@
 <div class="section-title">
+  <!-- Publisher field -->
+  <div class="field">
+    Publisher:<span class="required-field">*</span><br>
+    <input type="text" id="publisher" name="publisher" class="input-text-long" value="<%= @work.resource.publisher %>" readonly />
+  </div>
+
+  <!-- Publication year field -->
+  <div class="field">
+    Publication Year:<span class="required-field">*</span><br>
+    <input type="text" id="publication_year" name="publication_year" class="input-text-year" value="<%= @work.resource.publication_year %>" readonly />
+  </div>
+
   <!-- DOI field -->
   <div class="field">
     DOI:<br>
@@ -29,6 +41,14 @@
     <input id="version_number" name="version_number" class="input-text-long" value="<%= @work.resource.version_number %>" readonly/>
   </div>
 
+  <!-- Collection field -->
+  <div class="field">
+    Collections: <span class="required-field">*</span><br>
+    <% current_user.submitter_collections.each do |collection| %>
+      <input id="collection" name="collection" class="input-text-long" value="<%= collection.title %>" readonly/>
+    <% end %>
+  </div>
+
   <!-- Collection Tags -->
   <div class="field">
     Collection Tags:<br>

app/views/works/_curator_controlled_form.html.erb

@@ -1,4 +1,14 @@
 <div class="section-title">
+  <div class="field">
+    Publisher:<span class="required-field">*</span><br>
+    <input type="text" id="publisher" name="publisher" class="input-text-long" value="<%= @work.resource.publisher %>" />
+  </div>
+
+  <div class="field">
+    Publication Year:<span class="required-field">*</span><br>
+    <input type="text" id="publication_year" name="publication_year" class="input-text-year" value="<%= @work.resource.publication_year %>" />
+  </div>
+
   <!-- DOI field (mostly for legacy DSpace works) -->
   <div class="field">
     <% if  @wizard_mode || @work.persisted? %>
@@ -43,10 +53,19 @@
     </select>
   </div>
 
+  <!-- Collection field -->
+  <div class="field">
+    Collection: <span class="required-field">*</span><br>
+    <select id="collection_id" name="collection_id" class="input-text-long" >
+      <% current_user.submitter_collections.each do |collection| %>
+        <option value="<%=collection.id%>" <%= @work.collection_id == collection.id ? "selected" : "" %>><%=collection.title%></option>
+      <% end %>
+    </select>
+  </div>
+
   <!-- Collection Tags field -->
   <div class="field">
     Collection Tags: <span class="text-muted field-hint">(enter tags that identify the collect in a comma separated list, e.g. Humanities, Life Sciences)</span><br>
     <input type="text" id="collection_tags" name="collection_tags" class="input-text-long" value="<%= @work.resource.collection_tags.join(', ') %>" />
   </div>
-
 </div>

spec/system/attention_form_submission_spec.rb

@@ -42,11 +42,10 @@
       click_on "Add Another Creator"
       fill_in "given_name_5", with: "Michael"
       fill_in "family_name_5", with: "Graziano"
-      click_on "v-pills-additional-tab"
+      click_on "v-pills-curator-controlled-tab"
       fill_in "publisher", with: publisher
       fill_in "publication_year", with: 2020
       find("#collection_id").find(:xpath, "option[1]").select_option
-      click_on "v-pills-curator-controlled-tab"
       fill_in "doi", with: doi
       fill_in "ark", with: ark
       click_on "Create"

spec/system/bitklavier_form_submission_spec.rb

@@ -42,7 +42,7 @@
       click_on "Add Another Creator"
       fill_in "given_name_5", with: "Christien"
       fill_in "family_name_5", with: "Ayres"
-      click_on "v-pills-additional-tab"
+      click_on "v-pills-curator-controlled-tab"
       fill_in "publisher", with: publisher
       fill_in "publication_year", with: 2021
       find("#collection_id").find(:xpath, "option[1]").select_option

spec/system/cklibrary_form_submission_spec.rb

@@ -32,11 +32,11 @@
       click_on "Add Another Creator"
       fill_in "given_name_2", with: "National Science Foundation"
       click_on "v-pills-additional-tab"
+      fill_in "keywords", with: keywords
+      click_on "v-pills-curator-controlled-tab"
       fill_in "publisher", with: publisher
       fill_in "publication_year", with: 2020
       find("#collection_id").find(:xpath, "option[1]").select_option
-      fill_in "keywords", with: keywords
-      click_on "v-pills-curator-controlled-tab"
       fill_in "doi", with: doi
       fill_in "ark", with: ark
       click_on "Create"

spec/system/cytoskeletal_form_submission_spec.rb

@@ -70,7 +70,7 @@
       click_on "Add Another Creator"
       fill_in "given_name_14", with: "Nina R"
       fill_in "family_name_14", with: "Salama"
-      click_on "v-pills-additional-tab"
+      click_on "v-pills-curation-tab"
       fill_in "publisher", with: publisher
       fill_in "publication_year", with: 2019
       find("#collection_id").find(:xpath, "option[1]").select_option

spec/system/femtosecond_form_submission_spec.rb

@@ -83,7 +83,7 @@
       click_on "Add Another Creator"
       fill_in "given_name_19", with: "Thomas S"
       fill_in "family_name_19", with: "Duffy"
-      click_on "v-pills-additional-tab"
+      click_on "v-pills-curator-controlled-tab"
       fill_in "publisher", with: publisher
       fill_in "publication_year", with: 2020
       find("#collection_id").find(:xpath, "option[1]").select_option

spec/system/form_submission_spec.rb

@@ -67,7 +67,7 @@
       click_on "Create New"
       fill_in "description", with: description
       find("#rights_identifier").find(:xpath, "option[2]").select_option
-      click_on "Additional Metadata"
+      click_on "Curator Controlled"
       fill_in "publication_year", with: issue_date
       click_on "Save Work"
       page.find(:xpath, "//input[@value='file_other']").choose

spec/system/migrate_submission_spec.rb

@@ -54,7 +54,6 @@
       click_on "Curator Controlled"
       fill_in "doi", with: doi
       fill_in "ark", with: ark
-      click_on "Additional Metadata"
       fill_in "publication_year", with: issue_date
       click_on "Create"
       click_on "Complete"
@@ -91,7 +90,6 @@
       click_on "Curator Controlled"
       fill_in "doi", with: doi
       fill_in "ark", with: ark
-      click_on "Additional Metadata"
       fill_in "publication_year", with: issue_date
       click_on "Create"
       expect(page).to have_content "Must provide a title"