enju_biblio 0.1.0.pre63 → 0.1.0.pre64

data/app/controllers/form_of_works_controller.rb

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

data/app/controllers/frequencies_controller.rb

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

data/app/controllers/identifier_types_controller.rb

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

data/app/controllers/import_requests_controller.rb

@@ -39,7 +39,7 @@ class ImportRequestsController < ApplicationController
   # POST /import_requests
   # POST /import_requests.json
   def create
-    @import_request = ImportRequest.new(params[:import_request])
+    @import_request = ImportRequest.new(import_request_params)
     @import_request.user = current_user
 
     respond_to do |format|
@@ -52,9 +52,17 @@ class ImportRequestsController < ApplicationController
             redirect_to new_import_request_url, notice: t('import_request.record_not_found')
           end
         }
+        format.mobile {
+          if @import_request.manifestation
+            redirect_to @import_request.manifestation, notice: t('controller.successfully_created', model: t('activerecord.models.import_request'))
+          else
+            redirect_to new_import_request_url, notice: t('import_request.record_not_found')
+          end
+        }
         format.json { render json: @import_request, status: :created, location: @import_request }
       else
         format.html { render action: "new" }
+        format.mobile { render action: "new" }
         format.json { render json: @import_request.errors, status: :unprocessable_entity }
       end
     end
@@ -68,7 +76,7 @@ class ImportRequestsController < ApplicationController
   # PUT /import_requests/1.json
   def update
     respond_to do |format|
-      if @import_request.update_attributes(params[:import_request])
+      if @import_request.update_attributes(import_request_params)
         @import_request.import!
         format.html { redirect_to @import_request, notice: t('controller.successfully_updated', model: t('activerecord.models.import_request')) }
         format.json { head :no_content }
@@ -89,4 +97,9 @@ class ImportRequestsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def import_request_params
+    params.require(:import_request).permit(:isbn, :manifestation_id, :user_id)
+  end
 end

data/app/controllers/items_controller.rb

@@ -70,6 +70,8 @@ class ItemsController < ApplicationController
           with(:agent_ids).equal_to agent.id if agent
           with(:manifestation_id).equal_to manifestation.id if manifestation
           with(:shelf_id).equal_to shelf.id if shelf
+          with(:circulation_status).equal_to params[:circulation_status] if params[:circulation_status].present?
+          facet :circulation_status if defined?(EnjuCirculation)
         end
       end
 
@@ -105,7 +107,9 @@ class ItemsController < ApplicationController
 
       page = params[:page] || 1
       search.query.paginate(page.to_i, per_page)
-      @items = search.execute!.results
+      result = search.execute
+      @circulation_status_facet = result.facet(:circulation_status).rows if defined?(EnjuCirculation)
+      @items = result.results
       @count[:total] = @items.total_entries
     end
 
@@ -131,6 +135,7 @@ class ItemsController < ApplicationController
   def show
     #@item = Item.find(params[:id])
     @item = @item.versions.find(@version).item if @version
+    @manifestation = @item.manifestation unless @manifestation
 
     respond_to do |format|
       format.html # show.html.erb
@@ -178,6 +183,7 @@ class ItemsController < ApplicationController
   # GET /items/1/edit
   def edit
     @item.library_id = @item.shelf.library_id
+    @manifestation = @item.manifestation
     if defined?(EnjuCirculation)
       unless @item.use_restriction
         @item.build_item_has_use_restriction
@@ -189,7 +195,7 @@ class ItemsController < ApplicationController
   # POST /items
   # POST /items.json
   def create
-    @item = Item.new(params[:item])
+    @item = Item.new(item_params)
     manifestation = Manifestation.find(@item.manifestation_id)
 
     respond_to do |format|
@@ -217,7 +223,7 @@ class ItemsController < ApplicationController
   # PUT /items/1.json
   def update
     respond_to do |format|
-      if @item.update_attributes(params[:item])
+      if @item.update_attributes(item_params)
         format.html { redirect_to @item, notice: t('controller.successfully_updated', model: t('activerecord.models.item')) }
         format.json { head :no_content }
       else
@@ -247,6 +253,18 @@ class ItemsController < ApplicationController
   end
 
   private
+  def item_params
+    params.require(:item).permit(
+      :call_number, :item_identifier, :circulation_status_id,
+      :checkout_type_id, :shelf_id, :include_supplements, :note, :url, :price,
+      :acquired_at, :bookstore_id, :missing_since, :budget_type_id,
+      :lock_version, :manifestation_id, :library_id, :required_role_id,
+      :binding_item_identifier, :binding_call_number, :binded_at,
+      :use_restriction_id,
+      :item_has_use_restriction_attributes => :use_restriction_id # EnjuCirculation
+    )
+  end
+
   def prepare_options
     @libraries = Library.real << Library.web
     if @item.new_record?

data/app/controllers/languages_controller.rb

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

data/app/controllers/licenses_controller.rb

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

data/app/controllers/manifestation_relationship_types_controller.rb

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

data/app/controllers/manifestation_relationships_controller.rb

@@ -47,7 +47,7 @@ class ManifestationRelationshipsController < ApplicationController
   # POST /manifestation_relationships
   # POST /manifestation_relationships.json
   def create
-    @manifestation_relationship = ManifestationRelationship.new(params[:manifestation_relationship])
+    @manifestation_relationship = ManifestationRelationship.new(manifestation_relationship_params)
 
     respond_to do |format|
       if @manifestation_relationship.save
@@ -72,7 +72,7 @@ class ManifestationRelationshipsController < ApplicationController
     end
 
     respond_to do |format|
-      if @manifestation_relationship.update_attributes(params[:manifestation_relationship])
+      if @manifestation_relationship.update_attributes(manifestation_relationship_params)
         format.html { redirect_to @manifestation_relationship, notice: t('controller.successfully_updated', model: t('activerecord.models.manifestation_relationship')) }
         format.json { head :no_content }
       else
@@ -102,6 +102,12 @@ class ManifestationRelationshipsController < ApplicationController
   end
 
   private
+  def manifestation_relationship_params
+    params.require(:manifestation_relationship).permit(
+      :parent_id, :child_id, :manifestation_relationship_type_id
+    )
+  end
+
   def prepare_options
     @manifestation_relationship_types = ManifestationRelationshipType.all
   end

data/app/controllers/manifestations_controller.rb

@@ -467,7 +467,7 @@ class ManifestationsController < ApplicationController
   # POST /manifestations
   # POST /manifestations.json
   def create
-    @manifestation = Manifestation.new(params[:manifestation])
+    @manifestation = Manifestation.new(manifestation_params)
     parent = Manifestation.where(id: @manifestation.parent_id).first
     unless @manifestation.original_title?
       @manifestation.original_title = @manifestation.attachment_file_name
@@ -496,7 +496,7 @@ class ManifestationsController < ApplicationController
   # PUT /manifestations/1.json
   def update
     respond_to do |format|
-      if @manifestation.update_attributes(params[:manifestation])
+      if @manifestation.update_attributes(manifestation_params)
         Sunspot.commit
         format.html { redirect_to @manifestation, notice: t('controller.successfully_updated', model: t('activerecord.models.manifestation')) }
         format.json { head :no_content }
@@ -526,6 +526,80 @@ class ManifestationsController < ApplicationController
   end
 
   private
+  def manifestation_params
+    params.require(:manifestation).permit(
+      :original_title, :title_alternative, :title_transcription,
+      :manifestation_identifier, :date_copyrighted,
+      :access_address, :language_id, :carrier_type_id, :extent, :start_page,
+      :end_page, :height, :width, :depth, :publication_place,
+      :price, :fulltext, :volume_number_string,
+      :issue_number_string, :serial_number_string, :edition, :note,
+      :repository_content, :required_role_id, :frequency_id,
+      :title_alternative_transcription, :description, :abstract, :available_at,
+      :valid_until, :date_submitted, :date_accepted, :date_captured,
+      :ndl_bib_id, :pub_date, :edition_string, :volume_number, :issue_number,
+      :serial_number, :content_type_id, :attachment, :lock_version,
+      :dimensions, :fulltext_content, :extent,
+      :number_of_page_string, :parent_id,
+      :serial, :statement_of_responsibility,
+      {:creators_attributes => [
+        :id, :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,
+        :_destroy
+      ]},
+      {:contributors_attributes => [
+        :id, :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,
+        :_destroy
+      ]},
+      {:publishers_attributes => [
+        :id, :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,
+        :_destroy
+      ]},
+      {:series_statements_attributes => [
+        :id, :original_title, :numbering, :title_subseries,
+        :numbering_subseries, :title_transcription, :title_alternative,
+        :title_subseries_transcription, :creator_string, :volume_number_string,
+        :volume_number_transcription_string, :series_master,
+        :_destroy
+      ]},
+      {:subjects_attributes => [
+        :id, :parent_id, :use_term_id, :term, :term_transcription,
+        :subject_type_id, :note, :required_role_id, :subject_heading_type_id,
+        :_destroy
+      ]},
+      {:classifications_attributes => [
+        :id, :parent_id, :category, :note, :classification_type_id,
+        :_destroy
+      ]},
+      {:identifiers_attributes => [
+        :id, :body, :identifier_type_id,
+        :_destroy
+      ]}
+    )
+  end
 
   def make_query(query, options = {})
     # TODO: integerやstringもqfに含める
@@ -726,18 +800,28 @@ class ManifestationsController < ApplicationController
     if options[:pub_date_from].blank?
       pub_date[:from] = "*"
     else
-      pub_date[:from] = Time.zone.parse(options[:pub_date_from]).beginning_of_day.utc.iso8601 rescue nil
+      year = options[:pub_date_from].rjust(4, "0")
+      if year.length == 4
+        pub_date[:from] = Time.zone.parse(Time.utc(year).to_s).beginning_of_year.utc.iso8601
+      else
+        pub_date[:from] = Time.zone.parse(options[:pub_date_from]).beginning_of_day.utc.iso8601 rescue nil
+      end
       unless pub_date[:from]
-        pub_date[:from] = Time.zone.parse(Time.mktime(options[:pub_date_from]).to_s).beginning_of_day.utc.iso8601
+        pub_date[:from] = Time.zone.parse(Time.utc(options[:pub_date_from]).to_s).beginning_of_day.utc.iso8601
       end
     end
 
     if options[:pub_date_to].blank?
       pub_date[:to] = "*"
     else
-      pub_date[:to] = Time.zone.parse(options[:pub_date_to]).end_of_day.utc.iso8601 rescue nil
+      year = options[:pub_date_to].rjust(4, "0")
+      if year.length == 4
+        pub_date[:to] = Time.zone.parse(Time.utc(year).to_s).end_of_year.utc.iso8601
+      else
+        pub_date[:to] = Time.zone.parse(options[:pub_date_to]).end_of_day.utc.iso8601 rescue nil
+      end
       unless pub_date[:to]
-        pub_date[:to] = Time.zone.parse(Time.mktime(options[:pub_date_to]).to_s).end_of_year.utc.iso8601
+        pub_date[:to] = Time.zone.parse(Time.utc(options[:pub_date_to]).to_s).end_of_year.utc.iso8601
       end
     end
     pub_date
@@ -762,20 +846,31 @@ class ManifestationsController < ApplicationController
       if options[:acquired_from].blank?
         acquisition_date[:from] = "*"
       else
-        acquisition_date[:from] = Time.zone.parse(options[:acquired_from]).beginning_of_day.utc.iso8601 rescue nil
+        year = options[:acquired_from].rjust(4, "0")
+        if year.length == 4
+          acquisition_date[:from] = Time.zone.parse(Time.utc(year).to_s).beginning_of_year.utc.iso8601
+        else
+          acquisition_date[:from] = Time.zone.parse(options[:acquired_from]).beginning_of_day.utc.iso8601 rescue nil
+        end
         unless acquisition_date[:from]
-          acquisition_date[:from] = Time.zone.parse(Time.mktime(options[:acquired_from]).to_s).beginning_of_day.utc.iso8601
+          acquisition_date[:from] = Time.zone.parse(Time.utc(options[:acquired_from]).to_s).beginning_of_day.utc.iso8601
         end
       end
 
       if options[:acquired_to].blank?
         acquisition_date[:to] = "*"
       else
-        acquisition_date[:to] = Time.zone.parse(options[:acquired_to]).end_of_day.utc.iso8601 rescue nil
+        year = options[:acquired_to].rjust(4, "0")
+        if year.length == 4
+          acquisition_date[:to] = Time.zone.parse(Time.utc(year).to_s).end_of_year.utc.iso8601
+        else
+          acquisition_date[:to] = Time.zone.parse(options[:acquired_to]).end_of_day.utc.iso8601 rescue nil
+        end
         unless acquisition_date[:to]
-          acquisition_date[:to] = Time.zone.parse(Time.mktime(options[:acquired_to]).to_s).end_of_year.utc.iso8601
+          pub_date[:to] = Time.zone.parse(Time.utc(options[:acquired_to]).to_s).end_of_year.utc.iso8601
         end
       end
+
       query = "#{query} acquired_at_d:[#{acquisition_date[:from]} TO #{acquisition_date[:to]}]"
     end
     query