enju_biblio 0.1.0.pre56 → 0.1.0.pre57

data/app/controllers/extents_controller.rb

@@ -1,13 +1,83 @@
-class ExtentsController < InheritedResources::Base
-  respond_to :html, :json
-  has_scope :page, default: 1
+class ExtentsController < ApplicationController
   load_and_authorize_resource
+  # GET /extents
+  # GET /extents.json
+  def index
+    @extents = Extent.all
 
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @extents }
+    end
+  end
+
+  # GET /extents/1
+  # GET /extents/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @extent }
+    end
+  end
+
+  # GET /extents/new
+  # GET /extents/new.json
+  def new
+    @extent = Extent.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @extent }
+    end
+  end
+
+  # GET /extents/1/edit
+  def edit
+  end
+
+  # POST /extents
+  # POST /extents.json
+  def create
+    @extent = Extent.new(params[:extent])
+
+    respond_to do |format|
+      if @extent.save
+        format.html { redirect_to @extent, notice:  t('controller.successfully_created', model:  t('activerecord.models.extent')) }
+        format.json { render json: @extent, status: :created, location: @extent }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @extent.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /extents/1
+  # PUT /extents/1.json
   def update
     if params[:move]
       move_position(@extent, params[:move])
       return
     end
-    update!
+
+    respond_to do |format|
+      if @extent.update_attributes(params[:extent])
+        format.html { redirect_to @extent, notice:  t('controller.successfully_updated', model:  t('activerecord.models.extent')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @extent.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /extents/1
+  # DELETE /extents/1.json
+  def destroy
+    @extent.destroy
+
+    respond_to do |format|
+      format.html { redirect_to extents_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.extent')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/controllers/form_of_works_controller.rb

@@ -1,13 +1,83 @@
-class FormOfWorksController < InheritedResources::Base
-  respond_to :html, :json
-  has_scope :page, default: 1
+class FormOfWorksController < ApplicationController
   load_and_authorize_resource
+  # GET /form_of_works
+  # GET /form_of_works.json
+  def index
+    @form_of_works = FormOfWork.all
 
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @form_of_works }
+    end
+  end
+
+  # GET /form_of_works/1
+  # GET /form_of_works/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @form_of_work }
+    end
+  end
+
+  # GET /form_of_works/new
+  # GET /form_of_works/new.json
+  def new
+    @form_of_work = FormOfWork.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @form_of_work }
+    end
+  end
+
+  # GET /form_of_works/1/edit
+  def edit
+  end
+
+  # POST /form_of_works
+  # POST /form_of_works.json
+  def create
+    @form_of_work = FormOfWork.new(params[:form_of_work])
+
+    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.json { render json: @form_of_work, status: :created, location: @form_of_work }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @form_of_work.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /form_of_works/1
+  # PUT /form_of_works/1.json
   def update
     if params[:move]
       move_position(@form_of_work, params[:move])
       return
     end
-    update!
+
+    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')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @form_of_work.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /form_of_works/1
+  # DELETE /form_of_works/1.json
+  def destroy
+    @form_of_work.destroy
+
+    respond_to do |format|
+      format.html { redirect_to form_of_works_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.form_of_work')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/controllers/frequencies_controller.rb

@@ -1,13 +1,83 @@
-class FrequenciesController < InheritedResources::Base
-  respond_to :html, :json
-  has_scope :page, default: 1
+class FrequenciesController < ApplicationController
   load_and_authorize_resource
+  # GET /frequencies
+  # GET /frequencies.json
+  def index
+    @frequencies = Frequency.all
 
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @frequencies }
+    end
+  end
+
+  # GET /frequencies/1
+  # GET /frequencies/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @frequency }
+    end
+  end
+
+  # GET /frequencies/new
+  # GET /frequencies/new.json
+  def new
+    @frequency = Frequency.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @frequency }
+    end
+  end
+
+  # GET /frequencies/1/edit
+  def edit
+  end
+
+  # POST /frequencies
+  # POST /frequencies.json
+  def create
+    @frequency = Frequency.new(params[:frequency])
+
+    respond_to do |format|
+      if @frequency.save
+        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" }
+        format.json { render json: @frequency.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /frequencies/1
+  # PUT /frequencies/1.json
   def update
     if params[:move]
       move_position(@frequency, params[:move])
       return
     end
-    update!
+
+    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')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @frequency.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /frequencies/1
+  # DELETE /frequencies/1.json
+  def destroy
+    @frequency.destroy
+
+    respond_to do |format|
+      format.html { redirect_to frequencies_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.frequency')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/controllers/identifier_types_controller.rb

@@ -1,10 +1,9 @@
 class IdentifierTypesController < ApplicationController
   load_and_authorize_resource
-
   # GET /identifier_types
   # GET /identifier_types.json
   def index
-    @identifier_types = IdentifierType.order(:position).page(params[:page])
+    @identifier_types = IdentifierType.all
 
     respond_to do |format|
       format.html # index.html.erb
@@ -43,7 +42,7 @@ class IdentifierTypesController < ApplicationController
 
     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" }
@@ -62,7 +61,7 @@ class IdentifierTypesController < ApplicationController
 
     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')) }
+        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" }
@@ -77,7 +76,7 @@ class IdentifierTypesController < ApplicationController
     @identifier_type.destroy
 
     respond_to do |format|
-      format.html { redirect_to identifier_types_url }
+      format.html { redirect_to identifier_types_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.identifier_type')) }
       format.json { head :no_content }
     end
   end

data/app/controllers/import_requests_controller.rb

@@ -85,7 +85,7 @@ class ImportRequestsController < ApplicationController
     @import_request.destroy
 
     respond_to do |format|
-      format.html { redirect_to import_requests_url }
+      format.html { redirect_to import_requests_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.import_request')) }
       format.json { head :no_content }
     end
   end

data/app/controllers/languages_controller.rb

@@ -1,7 +1,7 @@
-class LanguagesController < InheritedResources::Base
-  respond_to :html, :json
+class LanguagesController < ApplicationController
   load_and_authorize_resource
-
+  # GET /languages
+  # GET /languages.json
   def index
     @languages = Language.page(params[:page])
 
@@ -11,11 +11,73 @@ class LanguagesController < InheritedResources::Base
     end
   end
 
+  # GET /languages/1
+  # GET /languages/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @language }
+    end
+  end
+
+  # GET /languages/new
+  # GET /languages/new.json
+  def new
+    @language = Language.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @language }
+    end
+  end
+
+  # GET /languages/1/edit
+  def edit
+  end
+
+  # POST /languages
+  # POST /languages.json
+  def create
+    @language = Language.new(params[:language])
+
+    respond_to do |format|
+      if @language.save
+        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" }
+        format.json { render json: @language.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /languages/1
+  # PUT /languages/1.json
   def update
     if params[:move]
       move_position(@language, params[:move])
       return
     end
-    update!
+
+    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')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @language.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /languages/1
+  # DELETE /languages/1.json
+  def destroy
+    @language.destroy
+
+    respond_to do |format|
+      format.html { redirect_to languages_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.language')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/controllers/licenses_controller.rb

@@ -1,12 +1,83 @@
-class LicensesController < InheritedResources::Base
-  respond_to :html, :json
+class LicensesController < ApplicationController
   load_and_authorize_resource
+  # GET /licenses
+  # GET /licenses.json
+  def index
+    @licenses = License.all
 
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @licenses }
+    end
+  end
+
+  # GET /licenses/1
+  # GET /licenses/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @license }
+    end
+  end
+
+  # GET /licenses/new
+  # GET /licenses/new.json
+  def new
+    @license = License.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @license }
+    end
+  end
+
+  # GET /licenses/1/edit
+  def edit
+  end
+
+  # POST /licenses
+  # POST /licenses.json
+  def create
+    @license = License.new(params[:license])
+
+    respond_to do |format|
+      if @license.save
+        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" }
+        format.json { render json: @license.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /licenses/1
+  # PUT /licenses/1.json
   def update
     if params[:move]
       move_position(@license, params[:move])
       return
     end
-    update!
+
+    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')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @license.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /licenses/1
+  # DELETE /licenses/1.json
+  def destroy
+    @license.destroy
+
+    respond_to do |format|
+      format.html { redirect_to licenses_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.license')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/controllers/manifestation_relationship_types_controller.rb

@@ -1,12 +1,83 @@
-class ManifestationRelationshipTypesController < InheritedResources::Base
-  respond_to :html, :json
+class ManifestationRelationshipTypesController < ApplicationController
   load_and_authorize_resource
+  # GET /manifestation_relationship_types
+  # GET /manifestation_relationship_types.json
+  def index
+    @manifestation_relationship_types = ManifestationRelationshipType.all
 
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @manifestation_relationship_types }
+    end
+  end
+
+  # GET /manifestation_relationship_types/1
+  # GET /manifestation_relationship_types/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @manifestation_relationship_type }
+    end
+  end
+
+  # GET /manifestation_relationship_types/new
+  # GET /manifestation_relationship_types/new.json
+  def new
+    @manifestation_relationship_type = ManifestationRelationshipType.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @manifestation_relationship_type }
+    end
+  end
+
+  # GET /manifestation_relationship_types/1/edit
+  def edit
+  end
+
+  # POST /manifestation_relationship_types
+  # POST /manifestation_relationship_types.json
+  def create
+    @manifestation_relationship_type = ManifestationRelationshipType.new(params[:manifestation_relationship_type])
+
+    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.json { render json: @manifestation_relationship_type, status: :created, location: @manifestation_relationship_type }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @manifestation_relationship_type.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /manifestation_relationship_types/1
+  # PUT /manifestation_relationship_types/1.json
   def update
     if params[:move]
       move_position(@manifestation_relationship_type, params[:move])
       return
     end
-    update!
+
+    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')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @manifestation_relationship_type.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /manifestation_relationship_types/1
+  # DELETE /manifestation_relationship_types/1.json
+  def destroy
+    @manifestation_relationship_type.destroy
+
+    respond_to do |format|
+      format.html { redirect_to manifestation_relationship_types_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.manifestation_relationship_type')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/controllers/manifestation_relationships_controller.rb

@@ -1,21 +1,104 @@
-class ManifestationRelationshipsController < InheritedResources::Base
-  respond_to :html, :json
-  has_scope :page, default: 1
+class ManifestationRelationshipsController < ApplicationController
   load_and_authorize_resource
-  before_filter :prepare_options, except: [:index, :destroy]
+  before_filter :get_manifestation
+  before_filter :prepare_options, only: [:new, :edit]
+  after_filter :solr_commit, only: [:create, :update, :destroy]
 
+  # GET /manifestation_relationships
+  # GET /manifestation_relationships.json
+  def index
+    case
+    when @manifestation
+      @manifestation_relationships = @manifestation.manifestation_relationships.order('manifestation_relationships.position').page(params[:page])
+    else
+      @manifestation_relationships = ManifestationRelationship.page(params[:page])
+    end
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @manifestation_relationships }
+    end
+  end
+
+  # GET /manifestation_relationships/1
+  # GET /manifestation_relationships/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @manifestation_relationship }
+    end
+  end
+
+  # GET /manifestation_relationships/new
   def new
+    if @manifestation.blank?
+      redirect_to manifestations_url
+      return
+    else
+      @manifestation_relationship = ManifestationRelationship.new
+      @manifestation_relationship.manifestation = @manifestation
+    end
+  end
+
+  # GET /manifestation_relationships/1/edit
+  def edit
+  end
+
+  # POST /manifestation_relationships
+  # POST /manifestation_relationships.json
+  def create
     @manifestation_relationship = ManifestationRelationship.new(params[:manifestation_relationship])
-    @manifestation_relationship.parent = Manifestation.find(params[:manifestation_id]) rescue nil
-    @manifestation_relationship.child = Manifestation.find(params[:child_id]) rescue nil
+
+    respond_to do |format|
+      if @manifestation_relationship.save
+        format.html { redirect_to @manifestation_relationship, notice: t('controller.successfully_created', model: t('activerecord.models.manifestation_relationship')) }
+        format.json { render json: @manifestation_relationship, status: :created, location: @manifestation_relationship }
+      else
+        prepare_options
+        format.html { render action: "new" }
+        format.json { render json: @manifestation_relationship.errors, status: :unprocessable_entity }
+      end
+    end
   end
 
+  # PUT /manifestation_relationships/1
+  # PUT /manifestation_relationships/1.json
   def update
-    if params[:move]
-      move_position(@manifestation_relationship, params[:move])
+    # 並べ替え
+    if @manifestation and params[:move]
+      move_position(@manifestation_relationship, params[:move], false)
+      redirect_to manifestation_relationships_url(manifestation_id: @manifestation_relationship.parent_id)
       return
     end
-    update!
+
+    respond_to do |format|
+      if @manifestation_relationship.update_attributes(params[:manifestation_relationship])
+        format.html { redirect_to @manifestation_relationship, notice: t('controller.successfully_updated', model: t('activerecord.models.manifestation_relationship')) }
+        format.json { head :no_content }
+      else
+        prepare_options
+        format.html { render action: "edit" }
+        format.json { render json: @manifestation_relationship.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /manifestation_relationships/1
+  # DELETE /manifestation_relationships/1.json
+  def destroy
+    @manifestation_relationship.destroy
+
+    respond_to do |format|
+      format.html {
+        flash[:notice] = t('controller.successfully_deleted', model: t('activerecord.models.manifestation_relationship'))
+        if @manifestation
+          redirect_to manifestations_url(manifestation_id: @manifestation.id)
+        else
+          redirect_to manifestation_relationships_url
+        end
+      }
+      format.json { head :no_content }
+    end
   end
 
   private