enju_resource_merge 0.1.0.pre7 → 0.1.0.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 917ad779ccddfd28acadf5d20a6187d029f468b3
-  data.tar.gz: accf23369f6f4fffc85b1071b7d4199abf27f673
+  metadata.gz: 5696cba3069aacbf3d90e6e8b44e3439430036d1
+  data.tar.gz: b6f9b9a97dbb67473649ebdb13080ce2aa3662af
 SHA512:
-  metadata.gz: 707d7a2dd6c2eeea4a37550e22b4a2c81f0b2d6a047a8f74f249f42141bda7faff0b78ce2668f1c326e8cfae124b3fdf65943e6f7e2d530116ba7bffafddd1d1
-  data.tar.gz: 214b01685119c62cd6b6a0cb13e7cd068c83573c7f0480d4b862c50c423bf80d938c3f9d3701ba4f20f1baec972b05f4cfee8df755eb8d3f7b4d8f2e80cf5b0a
+  metadata.gz: b7266fa6d3dc5838dfb93cef447e12c54968d3d6f96620be010610a2ec2980776e15c9cced24d4608c8f08d5704900224bb05907544f9c6e350516c54116f0e3
+  data.tar.gz: ad7c2598aca6db0c81977f56a8345f8f8d148afcf713245d381a76e38f124e4771596117fd22af06ef4c70dcd2ea2619dcc8fae3ef4d6a9402c78cd8ee454005

data/app/controllers/patron_merge_lists_controller.rb

@@ -1,92 +1,92 @@
-class PatronMergeListsController < ApplicationController
+class AgentMergeListsController < ApplicationController
   load_and_authorize_resource
 
-  # GET /patron_merge_lists
-  # GET /patron_merge_lists.json
+  # GET /agent_merge_lists
+  # GET /agent_merge_lists.json
   def index
-    @patron_merge_lists = PatronMergeList.page(params[:page])
+    @agent_merge_lists = AgentMergeList.page(params[:page])
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @patron_merge_lists }
+      format.json { render :json => @agent_merge_lists }
     end
   end
 
-  # GET /patron_merge_lists/1
-  # GET /patron_merge_lists/1.json
+  # GET /agent_merge_lists/1
+  # GET /agent_merge_lists/1.json
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @patron_merge_list }
+      format.json { render :json => @agent_merge_list }
     end
   end
 
-  # GET /patron_merge_lists/new
-  # GET /patron_merge_lists/new.json
+  # GET /agent_merge_lists/new
+  # GET /agent_merge_lists/new.json
   def new
-    @patron_merge_list = PatronMergeList.new
+    @agent_merge_list = AgentMergeList.new
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @patron_merge_list }
+      format.json { render :json => @agent_merge_list }
     end
   end
 
-  # GET /patron_merge_lists/1/edit
+  # GET /agent_merge_lists/1/edit
   def edit
   end
 
-  # POST /patron_merge_lists
-  # POST /patron_merge_lists.json
+  # POST /agent_merge_lists
+  # POST /agent_merge_lists.json
   def create
-    @patron_merge_list = PatronMergeList.new(params[:patron_merge_list])
+    @agent_merge_list = AgentMergeList.new(params[:agent_merge_list])
 
     respond_to do |format|
-      if @patron_merge_list.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.patron_merge_list'))
-        format.html { redirect_to(@patron_merge_list) }
-        format.json { render :json => @patron_merge_list, :status => :created, :location => @patron_merge_list }
+      if @agent_merge_list.save
+        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 }
       else
         format.html { render :action => "new" }
-        format.json { render :json => @patron_merge_list.errors, :status => :unprocessable_entity }
+        format.json { render :json => @agent_merge_list.errors, :status => :unprocessable_entity }
       end
     end
   end
 
-  # PUT /patron_merge_lists/1
-  # PUT /patron_merge_lists/1.json
+  # PUT /agent_merge_lists/1
+  # PUT /agent_merge_lists/1.json
   def update
     respond_to do |format|
-      if @patron_merge_list.update_attributes(params[:patron_merge_list])
+      if @agent_merge_list.update_attributes(params[:agent_merge_list])
         if params[:mode] == 'merge'
-          selected_patron = Patron.where(:id => params[:selected_patron_id]).first
-          if selected_patron
-            @patron_merge_list.merge_patrons(selected_patron)
-            flash[:notice] = t('merge_list.successfully_merged', :model => t('activerecord.models.patron'))
+          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'))
           else
-            flash[:notice] = t('merge_list.specify_id', :model => t('activerecord.models.patron'))
-            redirect_to patron_merge_list_url(@patron_merge_list)
+            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.patron_merge_list'))
+          flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.agent_merge_list'))
         end
-        format.html { redirect_to(@patron_merge_list) }
+        format.html { redirect_to(@agent_merge_list) }
         format.json { head :no_content }
       else
         format.html { render :action => "edit" }
-        format.json { render :json => @patron_merge_list.errors, :status => :unprocessable_entity }
+        format.json { render :json => @agent_merge_list.errors, :status => :unprocessable_entity }
       end
     end
   end
 
-  # DELETE /patron_merge_lists/1
-  # DELETE /patron_merge_lists/1.json
+  # DELETE /agent_merge_lists/1
+  # DELETE /agent_merge_lists/1.json
   def destroy
-    @patron_merge_list.destroy
+    @agent_merge_list.destroy
 
     respond_to do |format|
-      format.html { redirect_to(patron_merge_lists_url) }
+      format.html { redirect_to(agent_merge_lists_url) }
       format.json { head :no_content }
     end
   end

data/app/controllers/patron_merges_controller.rb

@@ -1,86 +1,86 @@
-class PatronMergesController < ApplicationController
+class AgentMergesController < ApplicationController
   load_and_authorize_resource
-  before_filter :get_patron, :get_patron_merge_list
+  before_filter :get_agent, :get_agent_merge_list
 
-  # GET /patron_merges
-  # GET /patron_merges.json
+  # GET /agent_merges
+  # GET /agent_merges.json
   def index
-    if @patron
-      @patron_merges = @patron.patron_merges.order('patron_merges.id').page(params[:page])
-    elsif @patron_merge_list
-      @patron_merges = @patron_merge_list.patron_merges.order('patron_merges.id').includes(:patron).page(params[:page])
+    if @agent
+      @agent_merges = @agent.agent_merges.order('agent_merges.id').page(params[:page])
+    elsif @agent_merge_list
+      @agent_merges = @agent_merge_list.agent_merges.order('agent_merges.id').includes(:agent).page(params[:page])
     else
-      @patron_merges = PatronMerge.page(params[:page])
+      @agent_merges = AgentMerge.page(params[:page])
     end
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @patron_merges }
+      format.json { render :json => @agent_merges }
     end
   end
 
-  # GET /patron_merges/1
-  # GET /patron_merges/1.json
+  # GET /agent_merges/1
+  # GET /agent_merges/1.json
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @patron_merge }
+      format.json { render :json => @agent_merge }
     end
   end
 
-  # GET /patron_merges/new
-  # GET /patron_merges/new.json
+  # GET /agent_merges/new
+  # GET /agent_merges/new.json
   def new
-    @patron_merge = PatronMerge.new
-    @patron_merge.patron = @patron
+    @agent_merge = AgentMerge.new
+    @agent_merge.agent = @agent
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @patron_merge }
+      format.json { render :json => @agent_merge }
     end
   end
 
-  # GET /patron_merges/1/edit
+  # GET /agent_merges/1/edit
   def edit
   end
 
-  # POST /patron_merges
-  # POST /patron_merges.json
+  # POST /agent_merges
+  # POST /agent_merges.json
   def create
-    @patron_merge = PatronMerge.new(params[:patron_merge])
+    @agent_merge = AgentMerge.new(params[:agent_merge])
 
     respond_to do |format|
-      if @patron_merge.save
-        format.html { redirect_to(@patron_merge, :notice => t('controller.successfully_created', :model => t('activerecord.models.patron_merge'))) }
-        format.json { render :json => @patron_merge, :status => :created, :location => @patron_merge }
+      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 }
       else
         format.html { render :action => "new" }
-        format.json { render :json => @patron_merge.errors, :status => :unprocessable_entity }
+        format.json { render :json => @agent_merge.errors, :status => :unprocessable_entity }
       end
     end
   end
 
-  # PUT /patron_merges/1
-  # PUT /patron_merges/1.json
+  # PUT /agent_merges/1
+  # PUT /agent_merges/1.json
   def update
     respond_to do |format|
-      if @patron_merge.update_attributes(params[:patron_merge])
-        format.html { redirect_to(@patron_merge, :notice => t('controller.successfully_updated', :model => t('activerecord.models.patron_merge'))) }
+      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.json { head :no_content }
       else
         format.html { render :action => "edit" }
-        format.json { render :json => @patron_merge.errors, :status => :unprocessable_entity }
+        format.json { render :json => @agent_merge.errors, :status => :unprocessable_entity }
       end
     end
   end
 
-  # DELETE /patron_merges/1
-  # DELETE /patron_merges/1.json
+  # DELETE /agent_merges/1
+  # DELETE /agent_merges/1.json
   def destroy
-    @patron_merge.destroy
+    @agent_merge.destroy
 
     respond_to do |format|
-      format.html { redirect_to(patron_merges_url) }
+      format.html { redirect_to(agent_merges_url) }
       format.json { head :no_content }
     end
   end

data/app/controllers/series_statement_merge_lists_controller.rb

@@ -61,7 +61,6 @@ class SeriesStatementMergeListsController < ApplicationController
         if params[:mode] == 'merge'
           selected_series_statement = SeriesStatement.find(params[:selected_series_statement_id]) rescue nil
           if selected_series_statement
-            @series_statement_merge_list.merge_series_statements(selected_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'))

data/app/models/agent_merge.rb

@@ -0,0 +1,21 @@
+class AgentMerge < ActiveRecord::Base
+  attr_accessible :agent_id, :agent_merge_list_id
+  belongs_to :agent, :validate => true
+  belongs_to :agent_merge_list, :validate => true
+  validates_presence_of :agent, :agent_merge_list
+  validates_associated :agent, :agent_merge_list
+
+  paginates_per 10
+end
+
+# == Schema Information
+#
+# Table name: agent_merges
+#
+#  id                  :integer          not null, primary key
+#  agent_id            :integer          not null
+#  agent_merge_list_id :integer          not null
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#
+

data/app/models/agent_merge_list.rb

@@ -0,0 +1,29 @@
+class AgentMergeList < ActiveRecord::Base
+  attr_accessible :title
+  has_many :agent_merges, :dependent => :destroy
+  has_many :agents, :through => :agent_merges
+  validates_presence_of :title
+
+  paginates_per 10
+
+  def merge_agents(selected_agent)
+    self.agents.each do |agent|
+      Create.update_all(['agent_id = ?', selected_agent.id], ['agent_id = ?', agent.id])
+      Produce.update_all(['agent_id = ?', selected_agent.id], ['agent_id = ?', agent.id])
+      Own.update_all(['agent_id = ?', selected_agent.id], ['agent_id = ?', agent.id])
+      Donate.update_all(['agent_id = ?', selected_agent.id], ['agent_id = ?', agent.id])
+      agent.destroy unless agent == selected_agent
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: agent_merge_lists
+#
+#  id         :integer          not null, primary key
+#  title      :string(255)
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+

data/app/models/enju_resource_merge/ability.rb

@@ -6,15 +6,15 @@ module EnjuResourceMerge
       case user.try(:role).try(:name)
       when 'Administrator'
         can :manage, [
-          PatronMerge,
-          PatronMergeList,
+          AgentMerge,
+          AgentMergeList,
           SeriesStatementMerge,
           SeriesStatementMergeList
         ]
       when 'Librarian'
         can :manage, [
-          PatronMerge,
-          PatronMergeList,
+          AgentMerge,
+          AgentMergeList,
           SeriesStatementMerge,
           SeriesStatementMergeList
         ]

data/app/models/series_statement_merge_list.rb

@@ -5,24 +5,6 @@ class SeriesStatementMergeList < ActiveRecord::Base
   validates_presence_of :title
 
   paginates_per 10
-
-  def merge_series_statements(selected_series_statement)
-    series_statements.each do |series_statement|
-      if series_statement == selected_series_statement
-        series_statement.root_manifestation.update_attributes!({
-          :original_title => selected_series_statement.original_title,
-          :title_transcription => selected_series_statement.title_transcription,
-          :title_alternative => selected_series_statement.title_alternative
-        }) if series_statement.root_manifestation
-      else
-        series_statement.manifestations.each do |manifestation|
-          manifestation.series_statement = selected_series_statement
-          manifestation.save!
-        end
-        series_statement.destroy
-      end
-    end
-  end
 end
 
 # == Schema Information

data/app/views/{patron_merge_lists → agent_merge_lists}/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for(@patron_merge_list) do |f| -%>
+<%= form_for(@agent_merge_list) do |f| -%>
   <%= f.error_messages -%>
   <div class="field">
     <%= f.label :title -%><br />

data/app/views/{patron_merge_lists → 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.patron_merge_list')) -%></h1>
+<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.agent_merge_list')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
@@ -7,7 +7,7 @@
 
 <div id="submenu" class="ui-corner-all">
   <ul>
-    <li><%= link_to t('page.show'), @patron_merge_list -%></li>
-    <li><%= link_to t('page.back'), patron_merge_lists_path -%></li>
+    <li><%= link_to t('page.show'), @agent_merge_list -%></li>
+    <li><%= link_to t('page.back'), agent_merge_lists_path -%></li>
   </ul>
 </div>

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

@@ -0,0 +1,33 @@
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.agent_merge_list')) -%></h1>
+<div id="content_list">
+
+<table class="table table-striped index">
+  <tr>
+    <th><%= t('activerecord.attributes.agent_merge_list.title') -%></th>
+    <th><%= t('page.created_at') -%></th>
+    <th></th>
+  </tr>
+
+<%- @agent_merge_lists.each do |agent_merge_list| -%>
+  <tr class="line<%= cycle("0", "1") -%>">
+    <td><%= link_to agent_merge_list.title, agent_merge_list -%></td>
+    <td><%= l(agent_merge_list.created_at) -%></td>
+    <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 -%>
+  </td>
+  </tr>
+<%- end -%>
+</table>
+
+<%= paginate(@agent_merge_lists) -%>
+</div>
+</div>
+
+<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>
+  </ul>
+</div>

data/app/views/{patron_merge_lists → 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.patron_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

@@ -0,0 +1,31 @@
+<div id="content_detail" class="ui-corner-all">
+<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| -%>
+  <p>
+  <strong><%= t('page.title') -%>:</strong>
+    <%= @agent_merge_list.title -%>
+  </p>
+
+  <ul>
+    <%- @agent_merge_list.agents.each do |agent| -%>
+      <li><%= radio_button_tag 'selected_agent_id', agent.id -%><%= link_to agent.full_name, agent -%></li>
+    <%- end -%>
+  </ul>
+  <%- if @agent_merge_list.agents.size > 1 -%>
+    <%= f.submit t('page.merge'), :data => {:confirm => t('page.are_you_sure')} -%>
+  <%- end -%>
+<%- end -%>
+
+</div>
+</div>
+
+<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.edit'), edit_agent_merge_list_path(@agent_merge_list) -%></li>
+    <li><%= back_to_index(flash[:page_info]) -%></li>
+  </ul>
+</div>

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

@@ -0,0 +1,31 @@
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.agent_merge')) -%></h1>
+<div id="content_list">
+
+<%= form_for(@agent_merge) do |f| -%>
+  <%= f.error_messages -%>
+
+  <div class="field">
+    <%= f.label t('activerecord.models.agent') -%><br />
+    <%= f.text_field :agent_id -%>
+  </div>
+
+  <div class="field">
+    <%= f.label t('activerecord.models.agent_merge_list') -%><br />
+    <%= f.text_field :agent_merge_list_id -%>
+  </div>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<%- end -%>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to t('page.show'), @agent_merge -%></li>
+    <li><%= link_to t('page.back'), agent_merges_path -%></li>
+  </ul>
+</div>

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

@@ -0,0 +1,32 @@
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.agent_merge')) -%></h1>
+<div id="content_list">
+
+<table class="table table-striped index">
+  <tr>
+    <td><%= t('activerecord.models.agent') -%></td>
+    <td><%= t('activerecord.models.agent_merge_list') -%></td>
+  </tr>
+
+<%- @agent_merges.each do |agent_merge| -%>
+  <tr class="line<%= cycle("0", "1") -%>">
+    <td><%= link_to agent_merge.agent.full_name, agent_merge.agent -%></td>
+    <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>
+  </tr>
+<%- end -%>
+</table>
+
+<%= paginate(@agent_merges) -%>
+</div>
+</div>
+
+<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>
+    <%- end -%>
+  </ul>
+</div>

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

@@ -0,0 +1,39 @@
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.new', :model => t('activerecord.models.agent_merge')) -%></h1>
+<div id="content_list">
+
+<%= form_for(@agent_merge) do |f| -%>
+  <%= f.error_messages -%>
+  <div class="field">
+    <%= f.label t('activerecord.models.agent') -%><br />
+    <%- if @agent -%>
+      <%= link_to @agent.full_name, @agent -%>
+      <%= f.hidden_field :agent_id -%>
+    <%- else -%>
+      <%= f.text_field :agent_id -%>
+    <%- end -%>
+  </div>
+
+  <div class="field">
+    <%= 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 -%>
+    <%- else -%>
+      <%= f.text_field :agent_merge_list_id, :value => params[:agent_merge_list_id] -%>
+    <%- end -%>
+  </div>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<%- end -%>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to t('page.back'), agent_merges_path -%></li>
+  </ul>
+</div>

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

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

data/config/routes.rb

@@ -1,13 +1,13 @@
 Rails.application.routes.draw do
-  resources :patrons do
-    resources :patron_merges
-    resources :patron_merge_lists
+  resources :agents do
+    resources :agent_merges
+    resources :agent_merge_lists
   end
-  resources :patron_merge_lists do
-    resources :patrons
-    resources :patron_merges
+  resources :agent_merge_lists do
+    resources :agents
+    resources :agent_merges
   end
-  resources :patron_merges
+  resources :agent_merges
 
   resources :series_statements do
     resources :series_statement_merges

data/db/migrate/133_create_agent_merges.rb

@@ -0,0 +1,15 @@
+class CreateAgentMerges < ActiveRecord::Migration
+  def self.up
+    create_table :agent_merges do |t|
+      t.integer :agent_id, :agent_merge_list_id, :null => false
+
+      t.timestamps
+    end
+    add_index :agent_merges, :agent_id
+    add_index :agent_merges, :agent_merge_list_id
+  end
+
+  def self.down
+    drop_table :agent_merges
+  end
+end