enju_biblio 0.1.0.pre63 → 0.1.0.pre64

data/app/controllers/medium_of_performances_controller.rb

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

data/app/controllers/owns_controller.rb

@@ -51,7 +51,7 @@ class OwnsController < ApplicationController
   # POST /owns
   # POST /owns.json
   def create
-    @own = Own.new(params[:own])
+    @own = Own.new(own_params)
 
     respond_to do |format|
       if @own.save
@@ -74,7 +74,7 @@ class OwnsController < ApplicationController
     end
 
     respond_to do |format|
-      if @own.update_attributes(params[:own])
+      if @own.update_attributes(own_params)
         format.html { redirect_to @own, notice: t('controller.successfully_updated', model: t('activerecord.models.own')) }
         format.json { head :no_content }
       else
@@ -104,4 +104,9 @@ class OwnsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def own_params
+    params.require(:own).permit(:agent_id, :item_id)
+  end
 end

data/app/controllers/picture_files_controller.rb

@@ -75,7 +75,7 @@ class PictureFilesController < ApplicationController
   # POST /picture_files
   # POST /picture_files.json
   def create
-    @picture_file = PictureFile.new(params[:picture_file])
+    @picture_file = PictureFile.new(picture_file_params)
 
     respond_to do |format|
       if @picture_file.save
@@ -114,7 +114,7 @@ class PictureFilesController < ApplicationController
     end
 
     respond_to do |format|
-      if @picture_file.update_attributes(params[:picture_file])
+      if @picture_file.update_attributes(picture_file_params)
         format.html { redirect_to @picture_file, notice: t('controller.successfully_updated', model: t('activerecord.models.picture_file')) }
         format.json { head :no_content }
       else
@@ -157,6 +157,12 @@ class PictureFilesController < ApplicationController
   end
 
   private
+  def picture_file_params
+    params.require(:picture_file).permit(
+      :picture, :picture_attachable_id, :picture_attachable_type
+    )
+  end
+
   def get_attachable
     get_manifestation
     if @manifestation

data/app/controllers/produce_types_controller.rb

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

data/app/controllers/produces_controller.rb

@@ -58,7 +58,7 @@ class ProducesController < ApplicationController
   # POST /produces
   # POST /produces.json
   def create
-    @produce = Produce.new(params[:produce])
+    @produce = Produce.new(produce_params)
 
     respond_to do |format|
       if @produce.save
@@ -82,7 +82,7 @@ class ProducesController < ApplicationController
     end
 
     respond_to do |format|
-      if @produce.update_attributes(params[:produce])
+      if @produce.update_attributes(produce_params)
         format.html { redirect_to @produce, notice: t('controller.successfully_updated', model: t('activerecord.models.produce')) }
         format.json { head :no_content }
       else
@@ -115,6 +115,12 @@ class ProducesController < ApplicationController
   end
 
   private
+  def produce_params
+    params.require(:produce).permit(
+      :agent_id, :manifestation_id, :produce_type_id, :position
+    )
+  end
+
   def prepare_options
     @produce_types = ProduceType.all
   end

data/app/controllers/realize_types_controller.rb

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

data/app/controllers/realizes_controller.rb

@@ -53,7 +53,7 @@ class RealizesController < ApplicationController
   # POST /realizes
   # POST /realizes.json
   def create
-    @realize = Realize.new(params[:realize])
+    @realize = Realize.new(realize_params)
 
     respond_to do |format|
       if @realize.save
@@ -78,7 +78,7 @@ class RealizesController < ApplicationController
     end
 
     respond_to do |format|
-      if @realize.update_attributes(params[:realize])
+      if @realize.update_attributes(realize_params)
         format.html { redirect_to @realize, notice: t('controller.successfully_updated', model: t('activerecord.models.realize')) }
         format.json { head :no_content }
       else
@@ -111,6 +111,12 @@ class RealizesController < ApplicationController
   end
 
   private
+  def realize_params
+    params.require(:realize).permit(
+      :agent_id, :expression_id, :realize_type_id, :position
+    )
+  end
+
   def prepare_options
     @realize_types = RealizeType.all
   end

data/app/controllers/resource_export_files_controller.rb

@@ -53,7 +53,7 @@ class ResourceExportFilesController < ApplicationController
   # POST /resource_export_files
   # POST /resource_export_files.json
   def create
-    @resource_export_file = ResourceExportFile.new(params[:resource_export_file])
+    @resource_export_file = ResourceExportFile.new(resource_export_file_params)
     @resource_export_file.user = current_user
 
     respond_to do |format|
@@ -74,7 +74,7 @@ class ResourceExportFilesController < ApplicationController
   # PUT /resource_export_files/1.json
   def update
     respond_to do |format|
-      if @resource_export_file.update_attributes(params[:resource_export_file])
+      if @resource_export_file.update_attributes(resource_export_file_params)
         if @resource_export_file.mode == 'export'
           ResourceExportFileQueue.perform(@resource_export_file.id)
         end
@@ -97,4 +97,9 @@ class ResourceExportFilesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def resource_export_file_params
+    params.require(:resource_export_file).permit(:mode)
+  end
 end

data/app/controllers/resource_import_files_controller.rb

@@ -55,7 +55,7 @@ class ResourceImportFilesController < ApplicationController
   # POST /resource_import_files
   # POST /resource_import_files.json
   def create
-    @resource_import_file = ResourceImportFile.new(params[:resource_import_file])
+    @resource_import_file = ResourceImportFile.new(resource_import_file_params)
     @resource_import_file.user = current_user
 
     respond_to do |format|
@@ -77,7 +77,7 @@ class ResourceImportFilesController < ApplicationController
   # PUT /resource_import_files/1.json
   def update
     respond_to do |format|
-      if @resource_import_file.update_attributes(params[:resource_import_file])
+      if @resource_import_file.update_attributes(resource_import_file_params)
         if @resource_import_file.mode == 'import'
           Resque.enqueue(ResourceImportFileQueue, @resource_import_file.id)
         end
@@ -103,6 +103,13 @@ class ResourceImportFilesController < ApplicationController
   end
 
   private
+  def resource_import_file_params
+    params.require(:resource_import_file).permit(
+      :resource_import, :edit_mode, :user_encoding, :mode,
+      :default_shelf_id, :library_id
+    )
+  end
+
   def prepare_options
     @libraries = Library.all
     library = Library.where(id: @resource_import_file.try(:library_id)).first

data/app/controllers/resource_import_results_controller.rb

@@ -36,4 +36,11 @@ class ResourceImportResultsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def resource_import_result_params
+    params.require(:resource_import_result).permit(
+      :resource_import_file_id, :manifestation_id, :item_id, :body
+    )
+  end
 end

data/app/controllers/series_statement_merge_lists_controller.rb

@@ -39,7 +39,7 @@ class SeriesStatementMergeListsController < ApplicationController
   # POST /series_statement_merge_lists
   # POST /series_statement_merge_lists.json
   def create
-    @series_statement_merge_list = SeriesStatementMergeList.new(params[:series_statement_merge_list])
+    @series_statement_merge_list = SeriesStatementMergeList.new(series_statement_merge_list_params)
 
     respond_to do |format|
       if @series_statement_merge_list.save
@@ -57,7 +57,7 @@ class SeriesStatementMergeListsController < ApplicationController
   # PUT /series_statement_merge_lists/1.json
   def update
     respond_to do |format|
-      if @series_statement_merge_list.update_attributes(params[:series_statement_merge_list])
+      if @series_statement_merge_list.update_attributes(series_statement_merge_list_params)
         if params[:mode] == 'merge'
           selected_series_statement = SeriesStatement.find(params[:selected_series_statement_id]) rescue nil
           if selected_series_statement
@@ -89,4 +89,9 @@ class SeriesStatementMergeListsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def series_statement_merge_list_params
+    params.require(:series_statement_merge_list).permit(:title)
+  end
 end

data/app/controllers/series_statement_merges_controller.rb

@@ -48,7 +48,7 @@ class SeriesStatementMergesController < ApplicationController
   # POST /series_statement_merges
   # POST /series_statement_merges.json
   def create
-    @series_statement_merge = SeriesStatementMerge.new(params[:series_statement_merge])
+    @series_statement_merge = SeriesStatementMerge.new(series_statement_merge_params)
 
     respond_to do |format|
       if @series_statement_merge.save
@@ -66,7 +66,7 @@ class SeriesStatementMergesController < ApplicationController
   # PUT /series_statement_merges/1.json
   def update
     respond_to do |format|
-      if @series_statement_merge.update_attributes(params[:series_statement_merge])
+      if @series_statement_merge.update_attributes(series_statement_merge_params)
         flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.series_statement_merge'))
         format.html { redirect_to(@series_statement_merge) }
         format.json { head :no_content }
@@ -87,4 +87,11 @@ class SeriesStatementMergesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def series_statement_merge_params
+    params.require(:series_statement_merge).permit(
+      :series_statement_id, :series_statement_merge_list_id
+    )
+  end
 end

data/app/controllers/series_statements_controller.rb

@@ -68,7 +68,7 @@ class SeriesStatementsController < ApplicationController
   # POST /series_statements
   # POST /series_statements.json
   def create
-    @series_statement = SeriesStatement.new(params[:series_statement])
+    @series_statement = SeriesStatement.new(series_statement_params)
     manifestation = Manifestation.find(@series_statement.manifestation_id) rescue nil
 
     respond_to do |format|
@@ -93,7 +93,7 @@ class SeriesStatementsController < ApplicationController
     end
 
     respond_to do |format|
-      if @series_statement.update_attributes(params[:series_statement])
+      if @series_statement.update_attributes(series_statement_params)
         format.html { redirect_to @series_statement, notice: t('controller.successfully_updated', model: t('activerecord.models.series_statement')) }
         format.json { head :no_content }
       else
@@ -114,4 +114,15 @@ class SeriesStatementsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def series_statement_params
+    params.require(:series_statement).permit(
+      :original_title, :numbering, :title_subseries,:numbering_subseries,
+      :title_transcription, :title_alternative, :series_statement_identifier,
+      :note, :root_manifestation_id, :url,
+      :title_subseries_transcription, :creator_string, :volume_number_string,
+      :series_master
+    )
+  end
 end

data/app/models/agent.rb

@@ -1,14 +1,5 @@
 # -*- encoding: utf-8 -*-
 class Agent < ActiveRecord::Base
-  attr_accessible :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
-
   scope :readable_by, lambda{ |user|
     if user
       where('required_role_id <= ?', user.try(:user_has_role).try(:role_id))

data/app/models/agent_import_file.rb

@@ -1,13 +1,13 @@
 class AgentImportFile < ActiveRecord::Base
-  include Statesman::Adapters::ActiveRecordModel
+  include Statesman::Adapters::ActiveRecordQueries
   include ImportFile
-  attr_accessible :agent_import, :edit_mode, :user_encoding, :mode
   default_scope { order('agent_import_files.id DESC') }
   scope :not_imported, -> { in_state(:pending) }
   scope :stucked, -> { in_state(:pending).where('agent_import_files.created_at < ?', 1.hour.ago) }
 
   if Setting.uploaded_file.storage == :s3
-    has_attached_file :agent_import, storage: :s3, s3_credentials: "#{Setting.amazon}",
+    has_attached_file :agent_import, storage: :s3,
+      s3_credentials: Setting.amazon,
       s3_permissions: :private
   else
     has_attached_file :agent_import,

data/app/models/agent_import_file_transition.rb

@@ -3,7 +3,7 @@ class AgentImportFileTransition < ActiveRecord::Base
 
   
   belongs_to :agent_import_file, inverse_of: :agent_import_file_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/agent_import_result.rb

@@ -1,5 +1,4 @@
 class AgentImportResult < ActiveRecord::Base
-  attr_accessible :agent_import_file_id, :agent_id, :body
   default_scope { order('agent_import_results.id') }
   scope :file_id, proc{|file_id| where(agent_import_file_id: file_id)}
   scope :failed, -> { where(agent_id: nil) }

data/app/models/agent_merge.rb

@@ -1,5 +1,4 @@
 class AgentMerge < ActiveRecord::Base
-  attr_accessible :agent_id, :agent_merge_list_id
   belongs_to :agent, validate: true
   belongs_to :agent_merge_list, validate: true
   validates_presence_of :agent, :agent_merge_list