enju_biblio 0.1.0.pre63 → 0.1.0.pre64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12c3398286d119f0c1da75ab93a49e47b05d3332
-  data.tar.gz: ca673d38b8c33ebb9b91e836af956ae45209970a
+  metadata.gz: 84f441b00ab4993e30a148f4586a3df9b3f6a7c7
+  data.tar.gz: 9bed5a638d31eee0f50ba95607f63814efb6f14c
 SHA512:
-  metadata.gz: 92c2e3f791d543aaa1060db69a01bc9ec4253875bb1ec865d890d1e2b3dec6e731218670a9d036c1c0fee62bc56a17f7fe962b96174ebd893f77a31a668cc2dd
-  data.tar.gz: 0402d031655a3fb8212b763ff37b305f179cb5a836b7a2f63cc6840a035693f903fb15c4ba0b24387e197bbabe0bd9554cdf5cf6736d090f78fc44e448070777
+  metadata.gz: 44a827b4622c2e70a28852b7a66ab287d56ba367354b4d7fba8cbda18f9e734b724dacb43e32fcc2cbdcfc0dde30c85fae945d2fdc900306bd0129ba5914d042
+  data.tar.gz: 6fc8700461ee0c88c84c79c9a713b838a40ab68e0a17cc2377a9a36a2d122e48df7145650ed059cd4aef9d84bd2d4a1901c0edbeb8e9619569fbc7b7e4ba90e0

data/app/controllers/agent_import_files_controller.rb

@@ -52,7 +52,7 @@ class AgentImportFilesController < ApplicationController
   # POST /agent_import_files
   # POST /agent_import_files.json
   def create
-    @agent_import_file = AgentImportFile.new(params[:agent_import_file])
+    @agent_import_file = AgentImportFile.new(agent_import_file_params)
     @agent_import_file.user = current_user
 
     respond_to do |format|
@@ -73,7 +73,7 @@ class AgentImportFilesController < ApplicationController
   # PUT /agent_import_files/1.json
   def update
     respond_to do |format|
-      if @agent_import_file.update_attributes(params[:agent_import_file])
+      if @agent_import_file.update_attributes(agent_import_file_params)
         if @agent_import_file.mode == 'import'
           Resque.enqueue(AgentImportFileQueue, @agent_import_file.id)
         end
@@ -96,4 +96,11 @@ class AgentImportFilesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def agent_import_file_params
+    params.require(:agent_import_file).permit(
+      :agent_import, :edit_mode, :user_encoding, :mode
+    )
+  end
 end

data/app/controllers/agent_import_results_controller.rb

@@ -36,4 +36,11 @@ class AgentImportResultsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def agent_import_result_params
+    params.require(:agent_import_result).permit(
+      :agent_import_file_id, :agent_id, :body
+    )
+  end
 end

data/app/controllers/agent_merge_lists_controller.rb

@@ -39,7 +39,7 @@ class AgentMergeListsController < ApplicationController
   # POST /agent_merge_lists
   # POST /agent_merge_lists.json
   def create
-    @agent_merge_list = AgentMergeList.new(params[:agent_merge_list])
+    @agent_merge_list = AgentMergeList.new(agent_merge_list_params)
 
     respond_to do |format|
       if @agent_merge_list.save
@@ -57,7 +57,7 @@ class AgentMergeListsController < ApplicationController
   # PUT /agent_merge_lists/1.json
   def update
     respond_to do |format|
-      if @agent_merge_list.update_attributes(params[:agent_merge_list])
+      if @agent_merge_list.update_attributes(agent_merge_list_params)
         if params[:mode] == 'merge'
           selected_agent = Agent.where(id: params[:selected_agent_id]).first
           if selected_agent
@@ -90,4 +90,9 @@ class AgentMergeListsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def agent_merge_list_params
+    params.fetch(:agent_merge_list, {}).permit(:title)
+  end
 end

data/app/controllers/agent_merges_controller.rb

@@ -47,7 +47,7 @@ class AgentMergesController < ApplicationController
   # POST /agent_merges
   # POST /agent_merges.json
   def create
-    @agent_merge = AgentMerge.new(params[:agent_merge])
+    @agent_merge = AgentMerge.new(agent_merge_params)
 
     respond_to do |format|
       if @agent_merge.save
@@ -64,7 +64,7 @@ class AgentMergesController < ApplicationController
   # PUT /agent_merges/1.json
   def update
     respond_to do |format|
-      if @agent_merge.update_attributes(params[:agent_merge])
+      if @agent_merge.update_attributes(agent_merge_params)
         format.html { redirect_to(@agent_merge, notice: t('controller.successfully_updated', model: t('activerecord.models.agent_merge'))) }
         format.json { head :no_content }
       else
@@ -84,4 +84,9 @@ class AgentMergesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def agent_merge_params
+    params.require(:agent_merge).permit(:agent_id, :agent_merge_list_id)
+  end
 end

data/app/controllers/agent_relationship_types_controller.rb

@@ -38,11 +38,11 @@ class AgentRelationshipTypesController < ApplicationController
   # POST /agent_relationship_types
   # POST /agent_relationship_types.json
   def create
-    @agent_relationship_type = AgentRelationshipType.new(params[:agent_relationship_type])
+    @agent_relationship_type = AgentRelationshipType.new(agent_relationship_type_params)
 
     respond_to do |format|
       if @agent_relationship_type.save
-        format.html { redirect_to @agent_relationship_type, notice:  t('controller.successfully_created', model:  t('activerecord.models.agent_relationship_type')) }
+        format.html { redirect_to @agent_relationship_type, notice: t('controller.successfully_created', model: t('activerecord.models.agent_relationship_type')) }
         format.json { render json: @agent_relationship_type, status: :created, location: @agent_relationship_type }
       else
         format.html { render action: "new" }
@@ -60,8 +60,8 @@ class AgentRelationshipTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @agent_relationship_type.update_attributes(params[:agent_relationship_type])
-        format.html { redirect_to @agent_relationship_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.agent_relationship_type')) }
+      if @agent_relationship_type.update_attributes(agent_relationship_type_params)
+        format.html { redirect_to @agent_relationship_type, notice: t('controller.successfully_updated', model: t('activerecord.models.agent_relationship_type')) }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -80,4 +80,9 @@ class AgentRelationshipTypesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def agent_relationship_type_params
+    params.require(:agent_relationship_type).permit(:name, :display_name, :note)
+  end
 end

data/app/controllers/agent_relationships_controller.rb

@@ -47,7 +47,7 @@ class AgentRelationshipsController < ApplicationController
   # POST /agent_relationships
   # POST /agent_relationships.json
   def create
-    @agent_relationship = AgentRelationship.new(params[:agent_relationship])
+    @agent_relationship = AgentRelationship.new(agent_relationship_params)
 
     respond_to do |format|
       if @agent_relationship.save
@@ -72,7 +72,7 @@ class AgentRelationshipsController < ApplicationController
     end
 
     respond_to do |format|
-      if @agent_relationship.update_attributes(params[:agent_relationship])
+      if @agent_relationship.update_attributes(agent_relationship_params)
         format.html { redirect_to @agent_relationship, notice: t('controller.successfully_updated', model: t('activerecord.models.agent_relationship')) }
         format.json { head :no_content }
       else
@@ -102,6 +102,12 @@ class AgentRelationshipsController < ApplicationController
   end
 
   private
+  def agent_relationship_params
+    params.require(:agent_relationship).permit(
+      :parent_id, :child_id, :agent_relationship_type_id
+    )
+  end
+
   def prepare_options
     @agent_relationship_types = AgentRelationshipType.all
   end

data/app/controllers/agent_types_controller.rb

@@ -38,11 +38,11 @@ class AgentTypesController < ApplicationController
   # POST /agent_types
   # POST /agent_types.json
   def create
-    @agent_type = AgentType.new(params[:agent_type])
+    @agent_type = AgentType.new(agent_type_params)
 
     respond_to do |format|
       if @agent_type.save
-        format.html { redirect_to @agent_type, notice:  t('controller.successfully_created', model:  t('activerecord.models.agent_type')) }
+        format.html { redirect_to @agent_type, notice: t('controller.successfully_created', model: t('activerecord.models.agent_type')) }
         format.json { render json: @agent_type, status: :created, location: @agent_type }
       else
         format.html { render action: "new" }
@@ -60,8 +60,8 @@ class AgentTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @agent_type.update_attributes(params[:agent_type])
-        format.html { redirect_to @agent_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.agent_type')) }
+      if @agent_type.update_attributes(agent_type_params)
+        format.html { redirect_to @agent_type, notice: t('controller.successfully_updated', model: t('activerecord.models.agent_type')) }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -80,4 +80,9 @@ class AgentTypesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def agent_type_params
+    params.require(:agent_type).permit(:name, :display_name, :note)
+  end
 end

data/app/controllers/agents_controller.rb

@@ -152,15 +152,7 @@ class AgentsController < ApplicationController
   # POST /agents
   # POST /agents.json
   def create
-    @agent = Agent.new(params[:agent])
-    #if @agent.user_username
-    #  @agent.user = User.find(@agent.user_username) rescue nil
-    #end
-    #unless current_user.has_role?('Librarian')
-    #  if @agent.user != current_user
-    #    access_denied; return
-    #  end
-    #end
+    @agent = Agent.new(agent_params)
 
     respond_to do |format|
       if @agent.save
@@ -186,7 +178,7 @@ class AgentsController < ApplicationController
   # PUT /agents/1.json
   def update
     respond_to do |format|
-      if @agent.update_attributes(params[:agent])
+      if @agent.update_attributes(agent_params)
         format.html { redirect_to @agent, notice: t('controller.successfully_updated', model: t('activerecord.models.agent')) }
         format.json { head :no_content }
       else
@@ -209,6 +201,19 @@ class AgentsController < ApplicationController
   end
 
   private
+  def agent_params
+    params.require(:agent).permit(
+      :last_name, :middle_name, :first_name,
+      :last_name_transcription, :middle_name_transcription,
+      :first_name_transcription, :corporate_name, :corporate_name_transcription,
+      :full_name, :full_name_transcription, :full_name_alternative,
+      :other_designation, :language_id,
+      :country_id, :agent_type_id, :note, :required_role_id, :email, :url,
+      :full_name_alternative_transcription, :title,
+      :agent_identifier
+    )
+  end
+
   def prepare_options
     @countries = Country.all_cache
     @agent_types = AgentType.all

data/app/controllers/carrier_types_controller.rb

@@ -40,7 +40,7 @@ class CarrierTypesController < ApplicationController
   # POST /carrier_types
   # POST /carrier_types.json
   def create
-    @carrier_type = CarrierType.new(params[:carrier_type])
+    @carrier_type = CarrierType.new(carrier_type_params)
 
     respond_to do |format|
       if @carrier_type.save
@@ -63,7 +63,7 @@ class CarrierTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @carrier_type.update_attributes(params[:carrier_type])
+      if @carrier_type.update_attributes(carrier_type_params)
         format.html { redirect_to @carrier_type, notice: t('controller.successfully_updated', model: t('activerecord.models.carrier_type')) }
         format.json { head :no_content }
       else
@@ -86,6 +86,18 @@ class CarrierTypesController < ApplicationController
   end
 
   private
+  def carrier_type_params
+    params.require(:carrier_type).permit(
+      :name, :display_name, :note, :position,
+      # EnjuCirculation
+      {
+        :carrier_type_has_checkout_types_attributes => [
+          :id, :checkout_type_id, :_destroy
+        ]
+      }
+    )
+  end
+
   def prepare_options
     if defined?(EnjuCirculation)
       @checkout_types = CheckoutType.select([:id, :display_name, :position])

data/app/controllers/content_types_controller.rb

@@ -38,11 +38,11 @@ class ContentTypesController < ApplicationController
   # POST /content_types
   # POST /content_types.json
   def create
-    @content_type = ContentType.new(params[:content_type])
+    @content_type = ContentType.new(content_type_params)
 
     respond_to do |format|
       if @content_type.save
-        format.html { redirect_to @content_type, notice:  t('controller.successfully_created', model:  t('activerecord.models.content_type')) }
+        format.html { redirect_to @content_type, notice: t('controller.successfully_created', model: t('activerecord.models.content_type')) }
         format.json { render json: @content_type, status: :created, location: @content_type }
       else
         format.html { render action: "new" }
@@ -60,8 +60,8 @@ class ContentTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @content_type.update_attributes(params[:content_type])
-        format.html { redirect_to @content_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.content_type')) }
+      if @content_type.update_attributes(content_type_params)
+        format.html { redirect_to @content_type, notice: t('controller.successfully_updated', model: t('activerecord.models.content_type')) }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -80,4 +80,9 @@ class ContentTypesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def content_type_params
+    params.require(:content_type).permit(:name, :display_name, :note)
+  end
 end

data/app/controllers/countries_controller.rb

@@ -38,11 +38,11 @@ class CountriesController < ApplicationController
   # POST /countries
   # POST /countries.json
   def create
-    @country = Country.new(params[:country])
+    @country = Country.new(country_params)
 
     respond_to do |format|
       if @country.save
-        format.html { redirect_to @country, notice:  t('controller.successfully_created', model:  t('activerecord.models.country')) }
+        format.html { redirect_to @country, notice: t('controller.successfully_created', model: t('activerecord.models.country')) }
         format.json { render json: @country, status: :created, location: @country }
       else
         format.html { render action: "new" }
@@ -60,8 +60,8 @@ class CountriesController < ApplicationController
     end
 
     respond_to do |format|
-      if @country.update_attributes(params[:country])
-        format.html { redirect_to @country, notice:  t('controller.successfully_updated', model:  t('activerecord.models.country')) }
+      if @country.update_attributes(country_params)
+        format.html { redirect_to @country, notice: t('controller.successfully_updated', model: t('activerecord.models.country')) }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -80,4 +80,11 @@ class CountriesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def country_params
+    params.require(:country).permit(
+      :name, :display_name, :alpha_2, :alpha_3, :numeric_3, :note
+    )
+  end
 end

data/app/controllers/create_types_controller.rb

@@ -38,11 +38,11 @@ class CreateTypesController < ApplicationController
   # POST /create_types
   # POST /create_types.json
   def create
-    @create_type = CreateType.new(params[:create_type])
+    @create_type = CreateType.new(create_type_params)
 
     respond_to do |format|
       if @create_type.save
-        format.html { redirect_to @create_type, notice:  t('controller.successfully_created', model:  t('activerecord.models.create_type')) }
+        format.html { redirect_to @create_type, notice: t('controller.successfully_created', model: t('activerecord.models.create_type')) }
         format.json { render json: @create_type, status: :created, location: @create_type }
       else
         format.html { render action: "new" }
@@ -60,8 +60,8 @@ class CreateTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @create_type.update_attributes(params[:create_type])
-        format.html { redirect_to @create_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.create_type')) }
+      if @create_type.update_attributes(create_type_params)
+        format.html { redirect_to @create_type, notice: t('controller.successfully_updated', model: t('activerecord.models.create_type')) }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -80,4 +80,9 @@ class CreateTypesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def create_type_params
+    params.require(:create_type).permit(:name, :display_name, :note, :position)
+  end
 end

data/app/controllers/creates_controller.rb

@@ -53,7 +53,7 @@ class CreatesController < ApplicationController
   # POST /creates
   # POST /creates.json
   def create
-    @create = Create.new(params[:create])
+    @create = Create.new(create_params)
 
     respond_to do |format|
       if @create.save
@@ -78,7 +78,7 @@ class CreatesController < ApplicationController
     end
 
     respond_to do |format|
-      if @create.update_attributes(params[:create])
+      if @create.update_attributes(create_params)
         format.html { redirect_to @create, notice: t('controller.successfully_updated', model: t('activerecord.models.create')) }
         format.json { head :no_content }
       else
@@ -111,6 +111,12 @@ class CreatesController < ApplicationController
   end
 
   private
+  def create_params
+    params.require(:create).permit(
+      :agent_id, :work_id, :create_type_id, :position
+    )
+  end
+
   def prepare_options
     @create_types = CreateType.all
   end

data/app/controllers/donates_controller.rb

@@ -39,7 +39,7 @@ class DonatesController < ApplicationController
   # POST /donates
   # POST /donates.json
   def create
-    @donate = Donate.new(params[:donate])
+    @donate = Donate.new(donate_params)
 
     respond_to do |format|
       if @donate.save
@@ -56,7 +56,7 @@ class DonatesController < ApplicationController
   # PUT /donates/1.json
   def update
     respond_to do |format|
-      if @donate.update_attributes(params[:donate])
+      if @donate.update_attributes(donate_params)
         format.html { redirect_to @donate, notice: t('controller.successfully_updated', model: t('activerecord.models.donate')) }
         format.json { head :no_content }
       else
@@ -76,4 +76,9 @@ class DonatesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def donate_params
+    params.require(:donate).permit(:agent_id, :item_id)
+  end
 end