diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 616228e06d..85d400a9b1 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -20,7 +20,6 @@ //= require form/mutex //= require browse_everything //= require valhalla/valhalla -//= require hydra-editor/hydra-editor //= require_tree . $(document).ready(function() { Initializer = require('figgy_boot') diff --git a/spec/controllers/file_sets_controller_spec.rb b/spec/controllers/file_sets_controller_spec.rb index b6f36f3398..3de96591f6 100644 --- a/spec/controllers/file_sets_controller_spec.rb +++ b/spec/controllers/file_sets_controller_spec.rb @@ -17,4 +17,13 @@ expect(file_set.title).to eq ["Second"] end end + + describe "GET /concern/file_sets/:id/edit" do + render_views + it "renders" do + file_set = FactoryGirl.create_for_repository(:file_set) + + expect { get :edit, params: { id: file_set.id.to_s } }.not_to raise_error + end + end end diff --git a/valhalla/app/assets/javascripts/valhalla/valhalla.js b/valhalla/app/assets/javascripts/valhalla/valhalla.js index e3e5eae27d..ef35fd1d76 100644 --- a/valhalla/app/assets/javascripts/valhalla/valhalla.js +++ b/valhalla/app/assets/javascripts/valhalla/valhalla.js @@ -14,9 +14,9 @@ //= require jquery-ui/widgets/sortable //= require jquery-ui/widgets/draggable //= require jquery-ui/widgets/selectable +//= require bootstrap/affix //= require babel/polyfill //= require hydra-editor/hydra-editor -//= require bootstrap/affix //= require valhalla/boot //= require_tree . $(document).ready(function() { @@ -24,3 +24,6 @@ $(document).ready(function() { window.booter = new cc.Initializer() }); +$(document).ready(function() { + $('.multi_value.form-group').manage_fields(); +}); diff --git a/valhalla/app/views/valhalla/base/_form_visibility_component.html.erb b/valhalla/app/views/valhalla/base/_form_visibility_component.html.erb index 58b099a98c..99fdc0a094 100644 --- a/valhalla/app/views/valhalla/base/_form_visibility_component.html.erb +++ b/valhalla/app/views/valhalla/base/_form_visibility_component.html.erb @@ -1,3 +1,4 @@ +<% if f.object.respond_to?(:visibility) %>
Visibility
+<% end %>