enju_resource_merge 0.1.0.pre8 → 0.1.0.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5696cba3069aacbf3d90e6e8b44e3439430036d1
-  data.tar.gz: b6f9b9a97dbb67473649ebdb13080ce2aa3662af
+  metadata.gz: e47afb8b2e11ff96b96d300eddc87edb8b5b9179
+  data.tar.gz: b301768abbc7d58cbacfd925406e757e395ac1be
 SHA512:
-  metadata.gz: b7266fa6d3dc5838dfb93cef447e12c54968d3d6f96620be010610a2ec2980776e15c9cced24d4608c8f08d5704900224bb05907544f9c6e350516c54116f0e3
-  data.tar.gz: ad7c2598aca6db0c81977f56a8345f8f8d148afcf713245d381a76e38f124e4771596117fd22af06ef4c70dcd2ea2619dcc8fae3ef4d6a9402c78cd8ee454005
+  metadata.gz: e2450ac0db2a0b6ab0bc9b50f8d57004942edcbf4444f9daa92ca08f41e2194ec8375dd5df9257ac6243fa1f033a578ec534efcbdd171de8c81c3eed309b78e3
+  data.tar.gz: 52e5bfae9d52ac0fb10264b929d5ae42225b4841385390db944d37b51e5ef5a1bc9790401bf1758bb1954da79456957c5b64b4d3d2e2f972698826e62d857a26

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

@@ -0,0 +1,53 @@
+<div id="content_detail" class="ui-corner-all">
+<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 -%>
+  <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')} -%>
+    <%- if can? :update, @agent_merge_list -%>
+      <%= render 'page/add' %>
+    <%- end -%>
+    <%= submit_tag t('page.search') -%>
+    <%= link_to t('page.back_to_index'), agent_merge_list_agents_path(@agent_merge_list) -%>
+  </p>
+<%- end -%>
+</div>
+
+<table class="table table-striped index">
+  <tr>
+    <th><%= t('activerecord.attributes.agent.full_name') -%></th>
+    <th><%= t('activerecord.models.agent_type') -%></th>
+    <th><%= t('activerecord.attributes.agent.date_of_birth') -%></th>
+    <th id="edit_icons"></th>
+  </tr>
+
+<%- @agents.each do |agent| -%>
+  <tr class="line<%= cycle("0", "1") -%>">
+    <td><%= link_to agent.full_name, agent_merge_list_agent_path(@agent_merge_list, agent) -%></td>
+    <td><%= agent.agent_type.display_name.localize -%></td>
+    <td><%=l agent.date_of_birth if agent.date_of_birth -%></td>
+    <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) -%>
+        <%- 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 -%>
+        <%- end -%>
+      <%- end -%>
+    </td>
+  </tr>
+<%- end -%>
+</table>
+
+<%= paginate(@agents) -%>
+</div>
+</div>
+
+<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>
+  </ul>
+</div>

data/lib/enju_resource_merge/version.rb

@@ -1,3 +1,3 @@
 module EnjuResourceMerge
-  VERSION = "0.1.0.pre8"
+  VERSION = "0.1.0.pre9"
 end

data/spec/dummy/config/initializers/devise.rb

@@ -1,6 +1,8 @@
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
+  config.secret_key = '45f57a5383d24acaa89247a9f29680dced180cf677ac322abf76d909f110e2ac3f3c3d5b3adb3d15db9933ead14d32a9d1811f0a6792b8d738ed4aea63076761'
+
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_resource_merge
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre8
+  version: 0.1.0.pre9
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre44
+        version: 0.1.0.pre47
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre44
+        version: 0.1.0.pre47
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc3
+        version: 1.1.0.rc6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc3
+        version: 1.1.0.rc6
 description: Merge resource records for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -101,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/controllers/patron_merge_lists_controller.rb
-- app/controllers/patron_merges_controller.rb
+- app/controllers/agent_merge_lists_controller.rb
+- app/controllers/agent_merges_controller.rb
 - app/controllers/series_statement_merge_lists_controller.rb
 - app/controllers/series_statement_merges_controller.rb
 - app/models/agent_merge.rb
@@ -119,6 +119,7 @@ files:
 - app/views/agent_merges/index.html.erb
 - app/views/agent_merges/new.html.erb
 - app/views/agent_merges/show.html.erb
+- app/views/agents/_index_patron_merge_list.html.erb
 - app/views/series_statement_merge_lists/_form.html.erb
 - app/views/series_statement_merge_lists/edit.html.erb
 - app/views/series_statement_merge_lists/index.html.erb
@@ -352,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: enju_resource_merge plugin