hydra-collections 4.0.0.beta3 → 4.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb3c19c725d2aaea1f447768b62c9025d258829e
-  data.tar.gz: e15c3a7eedf2189af5dc15707c45fd2c7bbe4618
+  metadata.gz: 1ceb4a9d6d1e049d7daf97c5a3dda2a716f9b66c
+  data.tar.gz: a525a022ac1de20217e618b8b2e15de8adfda38b
 SHA512:
-  metadata.gz: 799056d3aa822e1777de9a149da7c88734b5f4a79b4dc33b208480ec55761f84cad5e41276806f30e65520e80cb2276bc9614db05cfe6b87a2f485ecda2409c2
-  data.tar.gz: b8cb44470bcddd4cd75927a1f6fc25bca71269b0dc10b9a7cabf287ec582de0485deaa7199aaed43ee2c0056a26648b7bea488ca89c10d36a83bd60a167e74a2
+  metadata.gz: aa9e0366c41a64ac3c7f327108d8e16c9fec65e40e531f2ef5f605faafb4d0a675cd1a703ee9f99e49ce6197aa419cb6006659524b6653e69e0f4cb1c8dfab7a
+  data.tar.gz: e8e608cf8aee67d07eb4d68e8ea74cdfb3b18ed9ef843d4c995305873f75143853d6b2e59553e00427b142ba7358fc0898f2215f4c1963c6c13984e313b228aa

data/app/controllers/concerns/hydra/collections_controller_behavior.rb

@@ -88,7 +88,7 @@ module Hydra
 
     def update
       process_member_changes
-      @collection.update_attributes(params[:collection].except(:members))
+      @collection.update_attributes(collection_params.except(:members))
       if @collection.save
         after_update
       else
@@ -120,6 +120,12 @@ module Hydra
 
     protected
 
+    def collection_params
+      params.require(:collection).permit(:part_of, :contributor, :creator, :title,
+        :description, :publisher, :date_created, :subject, :language, :rights,
+        :resource_type, :identifier, :based_near, :tag, :related_url, :members)
+    end
+
     # Queries Solr for members of the collection.
     # Populates @response and @member_docs similar to Blacklight Catalog#index populating @response and @documents
     def query_collection_members

data/app/models/concerns/hydra/collection.rb

@@ -69,18 +69,6 @@ module Hydra
       after_save :update_all_members
     end
 
-    def terms_for_editing
-      terms_for_display - [:date_modified, :date_uploaded]
-    end
-
-    def terms_for_display
-      [
-        :part_of, :contributor, :creator, :title, :description, :publisher,
-        :date_created, :date_uploaded, :date_modified, :subject, :language, :rights,
-        :resource_type, :identifier, :based_near, :tag, :related_url
-      ]
-    end
-
     def update_all_members
       self.members.collect { |m| update_member(m) }
     end

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "4.0.0.beta3"
+    VERSION = "4.0.0.beta4"
   end
 end

data/spec/models/collection_spec.rb

@@ -143,14 +143,6 @@ describe Collection, :type => :model do
     expect(subject.reload.description).to eq "description"
   end
 
-  it "should have the expected display terms" do
-    expect(subject.terms_for_display).to eq([:part_of, :contributor, :creator, :title, :description, :publisher, :date_created, :date_uploaded, :date_modified, :subject, :language, :rights, :resource_type, :identifier, :based_near, :tag, :related_url])
-  end
-
-  it "should have the expected edit terms" do
-    expect(subject.terms_for_editing).to eq([:part_of, :contributor, :creator, :title, :description, :publisher, :date_created, :subject, :language, :rights, :resource_type, :identifier, :based_near, :tag, :related_url])
-  end
-
   describe "#destroy" do
     before do
       subject.members = [gf1, gf2]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta3
+  version: 4.0.0.beta4
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight