enju_resource_merge 0.1.0.pre10 → 0.1.0.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b85823eb179490a7aca14fc3cef6e05ab546415
-  data.tar.gz: c6da1a423e8ac76142b1509fce96b88fc180fe66
+  metadata.gz: cdf752c4c58506a340b09f6a37181e762d3c0feb
+  data.tar.gz: 9e87f0363fd0a056c051a8275f325b023ca8b935
 SHA512:
-  metadata.gz: 6664e80d10b7008ca1cd3136993a8277060972702a075218c8ac612b42d0afe1609c05a0195b6c4cf778500f9eb2454561454c4baf7aefb5ec81c921e6e22837
-  data.tar.gz: ca17c0c07a5d5ec81658a68a5e36b0d755a835692a323e5b8ba6a72b23d1f86d38c183bb43a7476017bcbc08decff3aeacfa663de75d2975328715aefc6b822c
+  metadata.gz: 3da7c675f1b133930eabcba0b6a5670ca02368652f54ec32aec18d01cdc3f5ba5978d04cb5afe9d6c90404b5ff52eded11f5ecaa42fcf232990faec7d1aa4f90
+  data.tar.gz: dd1160039f5dffc0c1a992389a4cac2bd1c9e727be3a4a0e6d2324bfc6c466f01766647d670f04ecd4adc628e8bb58e25260bdcfe3089e0593baba6d80c1281f

data/app/controllers/agent_merge_lists_controller.rb

@@ -8,7 +8,7 @@ class AgentMergeListsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @agent_merge_lists }
+      format.json { render json: @agent_merge_lists }
     end
   end
 
@@ -17,7 +17,7 @@ class AgentMergeListsController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @agent_merge_list }
+      format.json { render json: @agent_merge_list }
     end
   end
 
@@ -28,7 +28,7 @@ class AgentMergeListsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @agent_merge_list }
+      format.json { render json: @agent_merge_list }
     end
   end
 
@@ -43,12 +43,12 @@ class AgentMergeListsController < ApplicationController
 
     respond_to do |format|
       if @agent_merge_list.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.agent_merge_list'))
+        flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.agent_merge_list'))
         format.html { redirect_to(@agent_merge_list) }
-        format.json { render :json => @agent_merge_list, :status => :created, :location => @agent_merge_list }
+        format.json { render json: @agent_merge_list, status: :created, location: @agent_merge_list }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @agent_merge_list.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @agent_merge_list.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -59,23 +59,23 @@ class AgentMergeListsController < ApplicationController
     respond_to do |format|
       if @agent_merge_list.update_attributes(params[:agent_merge_list])
         if params[:mode] == 'merge'
-          selected_agent = Agent.where(:id => params[:selected_agent_id]).first
+          selected_agent = Agent.where(id: params[:selected_agent_id]).first
           if selected_agent
             @agent_merge_list.merge_agents(selected_agent)
-            flash[:notice] = t('merge_list.successfully_merged', :model => t('activerecord.models.agent'))
+            flash[:notice] = t('merge_list.successfully_merged', model: t('activerecord.models.agent'))
           else
-            flash[:notice] = t('merge_list.specify_id', :model => t('activerecord.models.agent'))
+            flash[:notice] = t('merge_list.specify_id', model: t('activerecord.models.agent'))
             redirect_to agent_merge_list_url(@agent_merge_list)
             return
           end
         else
-          flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.agent_merge_list'))
+          flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.agent_merge_list'))
         end
         format.html { redirect_to(@agent_merge_list) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @agent_merge_list.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @agent_merge_list.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/agent_merges_controller.rb

@@ -15,7 +15,7 @@ class AgentMergesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @agent_merges }
+      format.json { render json: @agent_merges }
     end
   end
 
@@ -24,7 +24,7 @@ class AgentMergesController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @agent_merge }
+      format.json { render json: @agent_merge }
     end
   end
 
@@ -36,7 +36,7 @@ class AgentMergesController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @agent_merge }
+      format.json { render json: @agent_merge }
     end
   end
 
@@ -51,11 +51,11 @@ class AgentMergesController < ApplicationController
 
     respond_to do |format|
       if @agent_merge.save
-        format.html { redirect_to(@agent_merge, :notice => t('controller.successfully_created', :model => t('activerecord.models.agent_merge'))) }
-        format.json { render :json => @agent_merge, :status => :created, :location => @agent_merge }
+        format.html { redirect_to(@agent_merge, notice: t('controller.successfully_created', model: t('activerecord.models.agent_merge'))) }
+        format.json { render json: @agent_merge, status: :created, location: @agent_merge }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @agent_merge.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @agent_merge.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -65,11 +65,11 @@ class AgentMergesController < ApplicationController
   def update
     respond_to do |format|
       if @agent_merge.update_attributes(params[:agent_merge])
-        format.html { redirect_to(@agent_merge, :notice => t('controller.successfully_updated', :model => t('activerecord.models.agent_merge'))) }
+        format.html { redirect_to(@agent_merge, notice: t('controller.successfully_updated', model: t('activerecord.models.agent_merge'))) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @agent_merge.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @agent_merge.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/series_statement_merge_lists_controller.rb

@@ -8,7 +8,7 @@ class SeriesStatementMergeListsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @series_statement_merge_lists }
+      format.json { render json: @series_statement_merge_lists }
     end
   end
 
@@ -17,7 +17,7 @@ class SeriesStatementMergeListsController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @series_statement_merge_list }
+      format.json { render json: @series_statement_merge_list }
     end
   end
 
@@ -28,7 +28,7 @@ class SeriesStatementMergeListsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @series_statement_merge_list }
+      format.json { render json: @series_statement_merge_list }
     end
   end
 
@@ -43,12 +43,12 @@ class SeriesStatementMergeListsController < ApplicationController
 
     respond_to do |format|
       if @series_statement_merge_list.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.series_statement_merge_list'))
+        flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.series_statement_merge_list'))
         format.html { redirect_to(@series_statement_merge_list) }
-        format.json { render :json => @series_statement_merge_list, :status => :created, :location => @series_statement_merge_list }
+        format.json { render json: @series_statement_merge_list, status: :created, location: @series_statement_merge_list }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @series_statement_merge_list.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @series_statement_merge_list.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -61,20 +61,20 @@ class SeriesStatementMergeListsController < ApplicationController
         if params[:mode] == 'merge'
           selected_series_statement = SeriesStatement.find(params[:selected_series_statement_id]) rescue nil
           if selected_series_statement
-            flash[:notice] = t('merge_list.successfully_merged', :model => t('activerecord.models.series_statement'))
+            flash[:notice] = t('merge_list.successfully_merged', model: t('activerecord.models.series_statement'))
           else
-            flash[:notice] = t('merge_list.specify_id', :model => t('activerecord.models.series_statement'))
+            flash[:notice] = t('merge_list.specify_id', model: t('activerecord.models.series_statement'))
             redirect_to series_statement_merge_list_url(@series_statement_merge_list)
             return
           end
         else
-          flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.series_statement_merge_list'))
+          flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.series_statement_merge_list'))
         end
         format.html { redirect_to(@series_statement_merge_list) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @series_statement_merge_list.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @series_statement_merge_list.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/series_statement_merges_controller.rb

@@ -15,7 +15,7 @@ class SeriesStatementMergesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @series_statement_merges }
+      format.json { render json: @series_statement_merges }
     end
   end
 
@@ -24,7 +24,7 @@ class SeriesStatementMergesController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @series_statement_merge }
+      format.json { render json: @series_statement_merge }
     end
   end
 
@@ -37,7 +37,7 @@ class SeriesStatementMergesController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @series_statement_merge }
+      format.json { render json: @series_statement_merge }
     end
   end
 
@@ -52,12 +52,12 @@ class SeriesStatementMergesController < ApplicationController
 
     respond_to do |format|
       if @series_statement_merge.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.series_statement_merge'))
+        flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.series_statement_merge'))
         format.html { redirect_to(@series_statement_merge) }
-        format.json { render :json => @series_statement_merge, :status => :created, :location => @series_statement_merge }
+        format.json { render json: @series_statement_merge, status: :created, location: @series_statement_merge }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @series_statement_merge.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @series_statement_merge.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -67,12 +67,12 @@ class SeriesStatementMergesController < ApplicationController
   def update
     respond_to do |format|
       if @series_statement_merge.update_attributes(params[:series_statement_merge])
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.series_statement_merge'))
+        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 }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @series_statement_merge.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @series_statement_merge.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/models/agent_merge.rb

@@ -1,7 +1,7 @@
 class AgentMerge < ActiveRecord::Base
   attr_accessible :agent_id, :agent_merge_list_id
-  belongs_to :agent, :validate => true
-  belongs_to :agent_merge_list, :validate => true
+  belongs_to :agent, validate: true
+  belongs_to :agent_merge_list, validate: true
   validates_presence_of :agent, :agent_merge_list
   validates_associated :agent, :agent_merge_list
 

data/app/models/agent_merge_list.rb

@@ -1,7 +1,7 @@
 class AgentMergeList < ActiveRecord::Base
   attr_accessible :title
-  has_many :agent_merges, :dependent => :destroy
-  has_many :agents, :through => :agent_merges
+  has_many :agent_merges, dependent: :destroy
+  has_many :agents, through: :agent_merges
   validates_presence_of :title
 
   paginates_per 10

data/app/models/series_statement_merge.rb

@@ -1,7 +1,7 @@
 class SeriesStatementMerge < ActiveRecord::Base
   attr_accessible :series_statement_id, :series_statement_merge_list_id
-  belongs_to :series_statement, :validate => true
-  belongs_to :series_statement_merge_list, :validate => true
+  belongs_to :series_statement, validate: true
+  belongs_to :series_statement_merge_list, validate: true
   validates_presence_of :series_statement, :series_statement_merge_list
   validates_associated :series_statement, :series_statement_merge_list
 

data/app/models/series_statement_merge_list.rb

@@ -1,7 +1,7 @@
 class SeriesStatementMergeList < ActiveRecord::Base
   attr_accessible :title
-  has_many :series_statement_merges, :dependent => :destroy
-  has_many :series_statements, :through => :series_statement_merges
+  has_many :series_statement_merges, dependent: :destroy
+  has_many :series_statements, through: :series_statement_merges
   validates_presence_of :title
 
   paginates_per 10

data/app/views/agent_merge_lists/edit.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.agent_merge_list')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.agent_merge_list')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

data/app/views/agent_merge_lists/index.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.agent_merge_list')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.agent_merge_list')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -16,7 +16,7 @@
     <td>
       <%= link_to t('page.show'), agent_merge_list -%>
       <%= link_to t('page.edit'), edit_agent_merge_list_path(agent_merge_list) -%>
-      <%= link_to t('page.destroy'), agent_merge_list, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+      <%= link_to t('page.destroy'), agent_merge_list, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
   </td>
   </tr>
 <%- end -%>
@@ -28,6 +28,6 @@
 
 <div id="submenu" class="ui-corner-all">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.agent_merge_list')), new_agent_merge_list_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.agent_merge_list')), new_agent_merge_list_path -%></li>
   </ul>
 </div>

data/app/views/agent_merge_lists/new.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-  <h1 class="title"><%= t('page.new', :model => t('activerecord.models.agent_merge_list')) -%></h1>
+  <h1 class="title"><%= t('page.new', model: t('activerecord.models.agent_merge_list')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

data/app/views/agent_merge_lists/show.html.erb

@@ -1,9 +1,9 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.agent_merge_list')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.agent_merge_list')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
-<%= form_for(:agent_merge_list, :url => agent_merge_list_path(@agent_merge_list, :mode => 'merge'), :html => { :method => :put }) do |f| -%>
+<%= form_for(:agent_merge_list, url: agent_merge_list_path(@agent_merge_list, mode: 'merge'), html: { method: :put }) do |f| -%>
   <p>
   <strong><%= t('page.title') -%>:</strong>
     <%= @agent_merge_list.title -%>
@@ -15,7 +15,7 @@
     <%- end -%>
   </ul>
   <%- if @agent_merge_list.agents.size > 1 -%>
-    <%= f.submit t('page.merge'), :data => {:confirm => t('page.are_you_sure')} -%>
+    <%= f.submit t('page.merge'), data: {confirm: t('page.are_you_sure')} -%>
   <%- end -%>
 <%- end -%>
 
@@ -24,7 +24,7 @@
 
 <div id="submenu" class="ui-corner-all">
   <ul>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.agent')), agent_merge_list_agents_path(@agent_merge_list) -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.agent')), agent_merge_list_agents_path(@agent_merge_list) -%></li>
     <li><%= link_to t('page.edit'), edit_agent_merge_list_path(@agent_merge_list) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>

data/app/views/agent_merges/edit.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.agent_merge')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.agent_merge')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@agent_merge) do |f| -%>

data/app/views/agent_merges/index.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.agent_merge')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.agent_merge')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -14,7 +14,7 @@
     <td><%= link_to agent_merge.agent_merge_list.title, agent_merge.agent_merge_list -%></td>
     <td><%= link_to t('page.show'), agent_merge -%></td>
     <td><%= link_to t('page.edit'), edit_agent_merge_path(agent_merge) -%></td>
-    <td><%= link_to t('page.destroy'), agent_merge, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></td>
+    <td><%= link_to t('page.destroy'), agent_merge, data: {confirm: t('page.are_you_sure')}, method: :delete -%></td>
   </tr>
 <%- end -%>
 </table>
@@ -26,7 +26,7 @@
 <div id="submenu" class="ui-corner-all">
   <ul>
     <%- if @agent_merge_list -%>
-      <li><%= link_to t('page.add', :model => t('activerecord.models.agent')), agent_merge_list_agents_path(@agent_merge_list) -%></li>
+      <li><%= link_to t('page.add', model: t('activerecord.models.agent')), agent_merge_list_agents_path(@agent_merge_list) -%></li>
     <%- end -%>
   </ul>
 </div>

data/app/views/agent_merges/new.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.agent_merge')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.agent_merge')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@agent_merge) do |f| -%>
@@ -18,9 +18,9 @@
     <%= f.label t('activerecord.models.agent_merge_list') -%><br />
     <%- if @agent_merge_list -%>
       <%= link_to @agent_merge_list.title, agent_merge_list_path(@agent_merge_list) -%>
-      <%= f.hidden_field :agent_merge_list_id, :value => @agent_merge_list.id -%>
+      <%= f.hidden_field :agent_merge_list_id, value: @agent_merge_list.id -%>
     <%- else -%>
-      <%= f.text_field :agent_merge_list_id, :value => params[:agent_merge_list_id] -%>
+      <%= f.text_field :agent_merge_list_id, value: params[:agent_merge_list_id] -%>
     <%- end -%>
   </div>
 

data/app/views/agent_merges/show.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.agent_merge')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.agent_merge')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -18,7 +18,7 @@
 
 <div id="submenu" class="ui-corner-all">
   <ul>
-    <li><%= link_to t('page.add', :model => t('activerecord.models.agent')), @agent_merge.agent_merge_list -%></li>
+    <li><%= link_to t('page.add', model: t('activerecord.models.agent')), @agent_merge.agent_merge_list -%></li>
     <li><%= link_to t('page.edit'), edit_agent_merge_path(@agent_merge) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>

data/app/views/agents/_index_agent_merge_list.html.erb

@@ -1,11 +1,11 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.agent')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.agent')) -%></h1>
 <div id="content_list">
 
 <div class="search_form">
-<%= form_for :agents, :url => agent_merge_list_agents_path(@agent_merge_list), :html => {:method => 'get'} do -%>
+<%= form_for :agents, url: agent_merge_list_agents_path(@agent_merge_list), html: {method: 'get'} do -%>
   <p>
-    <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
+    <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
     <%- if can? :update, @agent_merge_list -%>
       <%= render 'page/add' %>
     <%- end -%>
@@ -31,10 +31,10 @@
     <td>
       <%- if can? :delete, agent -%>
         <%- if params[:mode] == 'add' -%>
-          <%= link_to t('page.add'), new_agent_merge_list_agent_merge_path(@agent_merge_list, :agent_id => agent.id) unless @agent_merge_list.agents.include?(agent) -%>
+          <%= link_to t('page.add'), new_agent_merge_list_agent_merge_path(@agent_merge_list, agent_id: agent.id) unless @agent_merge_list.agents.include?(agent) -%>
         <%- else -%>
-          <%- agent_merge = @agent_merge_list.agent_merges.where(:agent_id => agent.id).first -%>
-          <%= link_to t('page.destroy'), agent_merge_list_agent_merge_path(@agent_merge_list, agent_merge), :data => {:confirm => t('page.are_you_sure')}, :method => :delete if agent_merge -%>
+          <%- agent_merge = @agent_merge_list.agent_merges.where(agent_id: agent.id).first -%>
+          <%= link_to t('page.destroy'), agent_merge_list_agent_merge_path(@agent_merge_list, agent_merge), data: {confirm: t('page.are_you_sure')}, method: :delete if agent_merge -%>
         <%- end -%>
       <%- end -%>
     </td>
@@ -48,6 +48,6 @@
 
 <div id="submenu" class="ui-corner-all">
   <ul>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.agent_merge_list')), @agent_merge_list -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.agent_merge_list')), @agent_merge_list -%></li>
   </ul>
 </div>

data/app/views/series_statement_merge_lists/edit.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.series_statement_merge_list')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.series_statement_merge_list')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

data/app/views/series_statement_merge_lists/index.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.series_statement_merge_list')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.series_statement_merge_list')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -16,7 +16,7 @@
     <td>
       <%= link_to t('page.show'), series_statement_merge_list -%>
       <%= link_to t('page.edit'), edit_series_statement_merge_list_path(series_statement_merge_list) -%>
-      <%= link_to t('page.destroy'), series_statement_merge_list, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+      <%= link_to t('page.destroy'), series_statement_merge_list, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
   </td>
   </tr>
 <%- end -%>
@@ -28,6 +28,6 @@
 
 <div id="submenu" class="ui-corner-all">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.series_statement_merge_list')), new_series_statement_merge_list_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.series_statement_merge_list')), new_series_statement_merge_list_path -%></li>
   </ul>
 </div>

data/app/views/series_statement_merge_lists/new.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-  <h1 class="title"><%= t('page.new', :model => t('activerecord.models.series_statement_merge_list')) -%></h1>
+  <h1 class="title"><%= t('page.new', model: t('activerecord.models.series_statement_merge_list')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

data/app/views/series_statement_merge_lists/show.html.erb

@@ -1,9 +1,9 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.series_statement_merge_list')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.series_statement_merge_list')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
-<%= form_for(:series_statement_merge_list, :url => series_statement_merge_list_path(@series_statement_merge_list, :mode => 'merge'), :html => { :method => :put }) do |f| -%>
+<%= form_for(:series_statement_merge_list, url: series_statement_merge_list_path(@series_statement_merge_list, mode: 'merge'), html: { method: :put }) do |f| -%>
   <p>
   <strong><%= t('page.title') -%>:</strong>
     <%= @series_statement_merge_list.title -%>
@@ -15,7 +15,7 @@
     <%- end -%>
   </ul>
   <%- if @series_statement_merge_list.series_statements.size > 1 -%>
-    <%= f.submit t('page.merge'), :data => {:confirm => t('page.are_you_sure')} -%>
+    <%= f.submit t('page.merge'), data: {confirm: t('page.are_you_sure')} -%>
   <%- end -%>
 <%- end -%>
 
@@ -24,7 +24,7 @@
 
 <div id="submenu" class="ui-corner-all">
   <ul>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.series_statement')), series_statement_merge_list_series_statements_path(@series_statement_merge_list) -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.series_statement')), series_statement_merge_list_series_statements_path(@series_statement_merge_list) -%></li>
     <li><%= link_to t('page.edit'), edit_series_statement_merge_list_path(@series_statement_merge_list) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>

data/app/views/series_statement_merges/edit.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.series_statement_merge')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.series_statement_merge')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@series_statement_merge) do |f| -%>

data/app/views/series_statement_merges/index.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.series_statement_merge')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.series_statement_merge')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -14,7 +14,7 @@
     <td><%= link_to series_statement_merge.series_statement_merge_list.title, series_statement_merge.series_statement_merge_list -%></td>
     <td><%= link_to t('page.show'), series_statement_merge -%></td>
     <td><%= link_to t('page.edit'), edit_series_statement_merge_path(series_statement_merge) -%></td>
-    <td><%= link_to t('page.destroy'), series_statement_merge, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></td>
+    <td><%= link_to t('page.destroy'), series_statement_merge, data: {confirm: t('page.are_you_sure')}, method: :delete -%></td>
   </tr>
 <%- end -%>
 </table>
@@ -26,7 +26,7 @@
 <div id="submenu" class="ui-corner-all">
   <ul>
     <%- if @series_statement_merge_list -%>
-      <li><%= link_to t('page.add', :model => t('activerecord.models.series_statement')), series_statement_merge_list_series_statements_path(@series_statement_merge_list) -%></li>
+      <li><%= link_to t('page.add', model: t('activerecord.models.series_statement')), series_statement_merge_list_series_statements_path(@series_statement_merge_list) -%></li>
     <%- end -%>
   </ul>
 </div>

data/app/views/series_statement_merges/new.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.series_statement_merge')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.series_statement_merge')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@series_statement_merge) do |f| -%>