Use refactored (non-_with_help) input types

samvera-deprecated · May 26, 2016 · 8314eb8 · 8314eb8
1 parent 3fed932
commit 8314eb8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/app/views/records/edit_fields/_default.html.erb b/app/views/records/edit_fields/_default.html.erb
@@ -1,5 +1,5 @@
 <% if f.object.class.multiple? key %>
-  <%= f.input key, as: :multi_value_with_help, input_html: { class: 'form-control' }, required: f.object.required?(key) %>
+  <%= f.input key, as: :multi_value, input_html: { class: 'form-control' }, required: f.object.required?(key) %>
 <% else %>
   <%= f.input key, required: f.object.required?(key) %>
 <% end %>
diff --git a/app/views/records/edit_fields/_description.html.erb b/app/views/records/edit_fields/_description.html.erb
@@ -1,5 +1,5 @@
 <% if f.object.class.multiple? key %>
-  <%= f.input :description, as: :multi_value_with_help, input_html: { rows: '14', type: 'textarea'}, required: false %>
+  <%= f.input :description, as: :multi_value, input_html: { rows: '14', type: 'textarea'}, required: false %>
 <% else %>
   <%= f.input :description, as: :text, input_html: { rows: '14' } %>
 <% end %>
diff --git a/app/views/records/edit_fields/_resource_type.html.erb b/app/views/records/edit_fields/_resource_type.html.erb
@@ -1,2 +1,2 @@
-<%= f.input :resource_type, as: :select_with_help, collection: ResourceTypesService.select_options,
+<%= f.input :resource_type, as: :select, collection: ResourceTypesService.select_options,
     input_html: { class: 'form-control', multiple: true } %>
diff --git a/app/views/records/edit_fields/_rights.html.erb b/app/views/records/edit_fields/_rights.html.erb
@@ -1,5 +1,6 @@
-<%= f.input :rights, as: :select_with_modal_help,
-    collection: RightsService.select_options,
+<%= f.input :rights, as: :multi_value_select,
+    collection: RightsService.select_active_options,
     include_blank: true,
-    input_html: { class: 'form-control', multiple: true } %>
+    item_helper: method(:include_current_value),
+    input_html: { class: 'form-control' } %>
 <%= render "curation_concerns/file_sets/rights_modal" %>