enju_biblio 0.1.0.pre56 → 0.1.0.pre57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99daa38e420051427e8608818d3679ed80dd4be7
-  data.tar.gz: 6c8e5fa37d67e33c6ff3a7423f2dc747a066d0f2
+  metadata.gz: 725c260ad04215dee9f9ffdec238b0d21da102bb
+  data.tar.gz: bee4e5ab54605fb4338aa3862edde45232d54c58
 SHA512:
-  metadata.gz: 5f738f3c0eb6a3ca984ae032d17ceacb2ee01c5dbb8d31fa1709470346cb19e0072f901079feb0c1ee08f8b30b5d06a4aeb1ee6873c6461a7aa84af679e798ef
-  data.tar.gz: dca4914c76b182b96eba3bcca18cbf0fc3e4bf53f35cb3d427c7df4b46fd79514902b0644e63509dc7791778d0a546903a23d33f17b85a0749d665a560bda6a8
+  metadata.gz: b83d8be25b262448587c0d51ae484f088399d079dc7c074ae2139c1a01d6e4988df9e1fd36a889ac548c5eb4459e4e8ff64202ad8b684a51572144015aa8683f
+  data.tar.gz: 9e0b84d885a257643145273caabd91136edb86ea5a3b02f4b1859699bb11b308603ee4d3beb09bb2566a60331c10b28775a8fa4d7feb6998a25ed559572dffac

data/app/controllers/agent_import_files_controller.rb

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

data/app/controllers/agent_import_results_controller.rb

@@ -1,15 +1,39 @@
-class AgentImportResultsController < InheritedResources::Base
-  respond_to :html, :json, :txt
+class AgentImportResultsController < ApplicationController
   load_and_authorize_resource
-  has_scope :file_id
-  actions :index, :show, :destroy
-
+  # GET /agent_import_results
+  # GET /agent_import_results.json
   def index
-    @agent_import_file = AgentImportFile.where(:id => params[:agent_import_file_id]).first
+    @agent_import_file = AgentImportFile.where(id: params[:agent_import_file_id]).first
     if @agent_import_file
       @agent_import_results = @agent_import_file.agent_import_results.page(params[:page])
     else
       @agent_import_results = AgentImportResult.page(params[:page])
     end
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @agent_import_results }
+      format.txt
+    end
+  end
+
+  # GET /agent_import_results/1
+  # GET /agent_import_results/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @agent_import_result }
+    end
+  end
+
+  # DELETE /agent_import_results/1
+  # DELETE /agent_import_results/1.json
+  def destroy
+    @agent_import_result.destroy
+
+    respond_to do |format|
+      format.html { redirect_to agent_import_results_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.agent_import_result')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/controllers/agent_relationship_types_controller.rb

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

data/app/controllers/agent_relationships_controller.rb

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

data/app/controllers/agent_types_controller.rb

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

data/app/controllers/carrier_types_controller.rb

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

data/app/controllers/content_types_controller.rb

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

data/app/controllers/countries_controller.rb

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

data/app/controllers/create_types_controller.rb

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