+ <% @members.each do |member| %>
+ <%= render "member", member: member %>
+ <% end %>
+
+
+
diff --git a/config/routes.rb b/config/routes.rb
index ced7d8b3d..0aa726d60 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -19,6 +19,10 @@
get '/concern/scanned_resources/:id/manifest', to: 'curation_concerns/scanned_resources#manifest', as: 'curation_concerns_scanned_resource_manifest', defaults: { format: :json }
get '/concern/scanned_resources/:id/pdf', to: 'curation_concerns/scanned_resources#pdf', as: 'curation_concerns_scanned_resource_pdf'
+ namespace :curation_concerns, path: :concern do
+ get '/scanned_resources/:id/reorder', to: 'scanned_resources#reorder', as: 'curation_concerns_scanned_resource_reorder'
+ post '/scanned_resources/:id/reorder', to: 'scanned_resources#save_order'
+ end
namespace :curation_concerns, path: :concern do
resources :scanned_resources, only: [:new, :create], path: 'container/:parent_id/scanned_resources', as: 'member_scanned_resource'
diff --git a/spec/controllers/curation_concerns/scanned_resources_controller_spec.rb b/spec/controllers/curation_concerns/scanned_resources_controller_spec.rb
index b0666ce1d..1ebc59097 100644
--- a/spec/controllers/curation_concerns/scanned_resources_controller_spec.rb
+++ b/spec/controllers/curation_concerns/scanned_resources_controller_spec.rb
@@ -55,8 +55,12 @@
describe "#manifest" do
let(:solr) { ActiveFedora.solr.conn }
+ let(:user) { FactoryGirl.create(:user) }
context "when requesting JSON" do
render_views
+ before do
+ sign_in user
+ end
it "builds a manifest" do
resource = FactoryGirl.build(:scanned_resource)
resource_2 = FactoryGirl.build(:scanned_resource)
@@ -128,4 +132,52 @@
expect(response).to redirect_to(Rails.application.class.routes.url_helpers.download_path(scanned_resource, file: 'pdf'))
end
end
+
+ describe "reorder" do
+ let(:resource) { FactoryGirl.create(:scanned_resource) }
+ let(:member) { FactoryGirl.create(:file_set) }
+ before do
+ 3.times { resource.ordered_members << member }
+ resource.save
+ sign_in user
+ get :reorder, id: resource.id
+ end
+
+ it "finds all proxies for the resource" do
+ expect(assigns(:members).map(&:id)).to eq resource.ordered_member_ids
+ end
+ end
+
+ describe "#save_order" do
+ let(:resource) { FactoryGirl.create(:scanned_resource, user: user) }
+ let(:member) { FactoryGirl.create(:file_set, user: user) }
+ let(:member_2) { FactoryGirl.create(:file_set, user: user) }
+ let(:new_order) { resource.ordered_member_ids }
+ let(:user) { FactoryGirl.create(:admin) }
+ render_views
+ before do
+ 3.times { resource.ordered_members << member }
+ resource.ordered_members << member_2
+ resource.save
+ sign_in user
+ post :save_order, id: resource.id, order: new_order, format: :json
+ end
+
+ context "when given a new order" do
+ let(:new_order) { [member.id, member.id, member_2.id, member.id] }
+ it "applies it" do
+ expect(response).to be_success
+ expect(resource.reload.ordered_member_ids).to eq new_order
+ end
+ end
+
+ context "when given an incomplete order" do
+ let(:new_order) { [member.id] }
+ it "fails and gives an error" do
+ expect(response).not_to be_success
+ expect(JSON.parse(response.body)["message"]).to eq "Order given has the wrong number of elements (should be 4)"
+ expect(response).to be_bad_request
+ end
+ end
+ end
end
diff --git a/spec/factories/file_sets.rb b/spec/factories/file_sets.rb
index cb6c0cd0f..937a00f65 100644
--- a/spec/factories/file_sets.rb
+++ b/spec/factories/file_sets.rb
@@ -21,7 +21,7 @@
if evaluator.content
Hydra::Works::UploadFileToFileSet.call(file, evaluator.content)
end
- FactoryGirl.create(:generic_work, user: evaluator.user).file_sets << file
+ FactoryGirl.create(:generic_work, user: evaluator.user).ordered_members << file
end
end
after(:build) do |file, evaluator|