Create, Realize, Produceモデルにnameを追加

app/helpers/enju_biblio/application_helper.rb

@@ -40,18 +40,14 @@ def agent_type_icon(agent_type)
       end
     end
 
-    def agents_list(agents = [], options = {})
-      return nil if agents.blank?
-
-      agents_list = []
+    def agents_list(authors, options = {})
+      list = []
       if options[:nolink]
-        agents_list = agents.map { |agent| agent.full_name }
+        return authors.pluck(:name)
       else
-        agents_list = agents.map { |agent|
-          link_to(agent.full_name, manifestations_path(query: "\"#{agent.full_name}\""), options) + " " + (link_to("[A]", agent_path(agent)) if agent.ndla_record)
-        }
+        list = authors.map{|author| link_to(author.name, manifestations_path(query: "\"#{author.name}\""), options)}
+        list.join(" ").html_safe
       end
-      agents_list.join(" ").html_safe
     end
 
     def ndl_bib_id_record_link(ndl_bib_id_record)

app/models/create.rb

@@ -20,6 +20,7 @@ def reindex
 # Table name: creates
 #
 #  id             :bigint           not null, primary key
+#  name           :text
 #  position       :integer
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null

app/models/manifestation.rb

@@ -559,23 +559,23 @@ def to_hash(role: "Guest")
       manifestation_identifier: manifestation_identifier,
       creator: creates.map { |create|
         if create.create_type
-          "#{create.agent.full_name}||#{create.create_type.name}"
+          "#{create.agent&.full_name}||#{create.create_type.name}"
         else
-          "#{create.agent.full_name}"
+          "#{create.agent&.full_name}"
         end
       }.join("//"),
       contributor: realizes.map { |realize|
         if realize.realize_type
-          "#{realize.agent.full_name}||#{realize.realize_type.name}"
+          "#{realize.agent&.full_name}||#{realize.realize_type.name}"
         else
-          "#{realize.agent.full_name}"
+          "#{realize.agent&.full_name}"
         end
       }.join("//"),
       publisher: produces.map { |produce|
         if produce.produce_type
-          "#{produce.agent.full_name}||#{produce.produce_type.name}"
+          "#{produce.agent&.full_name}||#{produce.produce_type.name}"
         else
-          "#{produce.agent.full_name}"
+          "#{produce.agent&.full_name}"
         end
       }.join("//"),
       pub_date: pub_date,

app/models/produce.rb

@@ -21,6 +21,7 @@ def reindex
 # Table name: produces
 #
 #  id               :bigint           not null, primary key
+#  name             :text
 #  position         :integer
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null

app/models/realize.rb

@@ -20,6 +20,7 @@ def reindex
 # Table name: realizes
 #
 #  id              :bigint           not null, primary key
+#  name            :text
 #  position        :integer
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null

app/views/agents/_expression_list.html.erb

@@ -3,15 +3,15 @@
   <ul>
     <%- @expressions.each do |manifestation| -%>
       <li>
-            [M]
-            <%= link_to manifestation.original_title, manifestation -%>
-            <%= form_icon(manifestation.carrier_type) -%>
-            <%= agents_list(manifestation.creators.readable_by(current_user)) -%>
-            <%= agents_list(manifestation.contributors.readable_by(current_user)) -%>
-            <%= agents_list(manifestation.publishers.readable_by(current_user)) -%>
-            <%- if manifestation.pub_date? -%>
-              (<%= manifestation.pub_date -%>)
-            <%- end -%>
+        [M]
+        <%= link_to manifestation.original_title, manifestation -%>
+        <%= form_icon(manifestation.carrier_type) -%>
+        <%= agents_list(manifestation.creates) -%>
+        <%= agents_list(manifestation.realizes) -%>
+        <%= agents_list(manifestation.produces) -%>
+        <%- if manifestation.pub_date? -%>
+          (<%= manifestation.pub_date -%>)
+        <%- end -%>
       </li>
     <%- end -%>
   </ul>

app/views/agents/_manifestation_list.html.erb

@@ -6,9 +6,9 @@
         [M]
         <%= link_to manifestation.original_title, manifestation -%>
         <%= form_icon(manifestation.carrier_type) -%>
-        <%= agents_list(manifestation.creators.readable_by(current_user)) -%>
-        <%= agents_list(manifestation.contributors.readable_by(current_user)) -%>
-        <%= agents_list(manifestation.publishers.readable_by(current_user)) -%>
+        <%= agents_list(manifestation.creates) -%>
+        <%= agents_list(manifestation.realizes) -%>
+        <%= agents_list(manifestation.produces) -%>
         <%- if manifestation.pub_date? -%>
           (<%= manifestation.pub_date -%>)
         <%- end -%>

app/views/agents/_work_list.html.erb

@@ -5,7 +5,7 @@
       <li>
         [W]
         <%= link_to work.original_title, work -%>
-        <%= agents_list(work.creators.readable_by(current_user)) -%>
+        <%= agents_list(work.creates) -%>
       </li>
     <%- end -%>
   </ul>

app/views/manifestations/_create_fields.html.erb

@@ -0,0 +1,4 @@
+<div class="nested-fields">
+  <%= f.text_field :name, class: 'creator_name resource_name' %>
+  <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %><br />
+</div>

app/views/manifestations/_form.html.erb

@@ -71,31 +71,31 @@
 
   <div class="field" id="creator_form">
     <%= f.label :creator_string -%><br />
-    <%= f.fields_for :creators, @manifestation.creators.order(Create.arel_table[:position].asc) do |creator_form| %>
-      <%= render 'creator_fields', f: creator_form %>
+    <%= f.fields_for :creates, @manifestation.creates.order(:position) do |create_form| %>
+      <%= render 'create_fields', f: create_form %>
     <% end %>
     <div class="links">
-      <p><%= link_to_add_association t('page.add'), f, :creators %></p>
+      <p><%= link_to_add_association t('page.add'), f, :creates %></p>
     </div>
   </div>
 
   <div class="field" id="contributor_form">
     <%= f.label :contributor_string -%><br />
-    <%= f.fields_for :contributors, @manifestation.contributors.order(Realize.arel_table[:position].asc) do |contributor_form| %>
-      <%= render 'contributor_fields', f: contributor_form %>
+    <%= f.fields_for :realizes, @manifestation.realizes.order(:position) do |realize_form| %>
+      <%= render 'realize_fields', f: realize_form %>
     <% end %>
     <div class="links">
-      <p><%= link_to_add_association t('page.add'), f, :contributors %></p>
+      <p><%= link_to_add_association t('page.add'), f, :realizes %></p>
     </div>
   </div>
 
   <div class="field" id="publisher_form">
     <%= f.label :publisher_string -%><br />
-    <%= f.fields_for :publishers, @manifestation.publishers.order(Produce.arel_table[:position].asc) do |publisher_form| %>
-      <%= render 'publisher_fields', f: publisher_form %>
+    <%= f.fields_for :produces, @manifestation.produces.order(:position) do |produce_form| %>
+      <%= render 'produce_fields', f: produce_form %>
     <% end %>
     <div class="links">
-      <p><%= link_to_add_association t('page.add'), f, :publishers %></p>
+      <p><%= link_to_add_association t('page.add'), f, :produces %></p>
     </div>
   </div>
 

app/views/manifestations/_manifestation_list.html.erb

@@ -6,9 +6,9 @@
           <%= link_to manifestation.original_title, manifestation -%>
           <%= form_icon(manifestation.carrier_type) -%>
           <%= link_to image_tag('icons/world_go.png', size: '16x16', class: 'enju_icon', alt: t('manifestation.web')), manifestation.access_address if manifestation.access_address? -%>
-          <%= agents_list(manifestation.creators.readable_by(current_user)) -%>
-          <%= agents_list(manifestation.contributors.readable_by(current_user)) -%>
-          <%= agents_list(manifestation.publishers.readable_by(current_user)) -%>
+          <%= agents_list(manifestation.creates) -%>
+          <%= agents_list(manifestation.realizes) -%>
+          <%= agents_list(manifestation.produces) -%>
           <%- if manifestation.pub_date? -%>
             (<%= manifestation.pub_date -%>)
           <%- end -%>
@@ -20,9 +20,9 @@
           <%= link_to manifestation.original_title, manifestation -%>
           <%= form_icon(manifestation.carrier_type) -%>
           <%= link_to image_tag('icons/world_go.png', size: '16x16', class: 'enju_icon', alt: t('manifestation.web')), manifestation.access_address if manifestation.access_address? -%>
-          <%= agents_list(manifestation.creators.readable_by(current_user)) -%>
-          <%= agents_list(manifestation.contributors.readable_by(current_user)) -%>
-          <%= agents_list(manifestation.publishers.readable_by(current_user)) -%>
+          <%= agents_list(manifestation.creates) -%>
+          <%= agents_list(manifestation.realizes) -%>
+          <%= agents_list(manifestation.produces) -%>
           <%- if manifestation.pub_date? -%>
             (<%= manifestation.pub_date -%>)
           <%- end -%>

app/views/manifestations/_produce_fields.html.erb

@@ -0,0 +1,4 @@
+<div class="nested-fields">
+  <%= f.text_field :name, class: 'resource_name' %>
+  <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %><br />
+</div>

app/views/manifestations/_realize_fields.html.erb

@@ -0,0 +1,4 @@
+<div class="nested-fields">
+  <%= f.text_field :name, class: 'resource_name' %>
+  <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %><br />
+</div>

app/views/manifestations/_show_creators.html+phone.erb

@@ -1,17 +1,17 @@
-  <%- if params[:mode] == 'show_all_creators' -%>
-    <%= agents_list(manifestation.creators.readable_by(current_user)) %>
-    <%- if manifestation.creators.readable_by(current_user).size > 5 -%>
-      (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, index_num: manifestation.id, mode: 'show_creators') %>'}); return false;"><%= t('page.hide') %></a>)
-    <%- end -%>
-  <%- else -%>
-    <%= agents_list(manifestation.creators.readable_by(current_user)[0..2]) %>
-    <%- if manifestation.creators.readable_by(current_user).size > 5 -%>
-      (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, index_num: manifestation.id, mode: 'show_all_creators') %>'}); return false;"><%= t('page.show_all') %></a>)
-    <%- end -%>
+<%- if params[:mode] == 'show_all_creators' -%>
+  <%= agents_list(manifestation.creates) %>
+  <%- if manifestation.creates.count > 5 -%>
+    (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, index_num: manifestation.id, mode: 'show_creators') %>'}); return false;"><%= t('page.hide') %></a>)
   <%- end -%>
-
-  <%= agents_list(manifestation.contributors.readable_by(current_user)) %>
-  <%= agents_list(manifestation.publishers.readable_by(current_user)) %>
-  <%- if manifestation.pub_date.present? -%>
-    (<%= manifestation.pub_date -%>)
+<%- else -%>
+  <%= agents_list(manifestation.creates[0..2]) %>
+  <%- if manifestation.creates.count > 5 -%>
+    (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, index_num: manifestation.id, mode: 'show_all_creators') %>'}); return false;"><%= t('page.show_all') %></a>)
   <%- end -%>
+<%- end -%>
+
+<%= agents_list(manifestation.realizes) %>
+<%= agents_list(manifestation.produces) %>
+<%- if manifestation.pub_date.present? -%>
+  (<%= manifestation.pub_date -%>)
+<%- end -%>

app/views/manifestations/_show_creators.html.erb

@@ -1,22 +1,21 @@
-  <%- if params[:mode] == 'show_all_creators' -%>
-    <%= agents_list(manifestation.creators.readable_by(current_user)) %>
-    <%- if manifestation.creators.readable_by(current_user).size > 5 -%>
-      (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, index_num: manifestation.id, mode: 'show_creators') %>'}); return false;"><%= t('page.hide') %></a>)
-    <%- end -%>
-  <%- else -%>
-    <%= agents_list(manifestation.creators.readable_by(current_user)[0..2]) %>
-    <%- if manifestation.creators.readable_by(current_user).size > 5 -%>
-      (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, index_num: manifestation.id, mode: 'show_all_creators') %>'}); return false;"><%= t('page.show_all') %></a>)
-    <%- end -%>
+<%- if params[:mode] == 'show_all_creators' -%>
+  <%= agents_list(manifestation.creates) %>
+  <%- if manifestation.creates.count > 5 -%>
+    (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, index_num: manifestation.id, mode: 'show_creators') %>'}); return false;"><%= t('page.hide') %></a>)
   <%- end -%>
-
-  <%= agents_list(manifestation.contributors.readable_by(current_user)) %>
-  <%= agents_list(manifestation.publishers.readable_by(current_user)) %>
-  <%- if manifestation.pub_date.present? -%>
-    (<%= manifestation.pub_date -%>)
+<%- else -%>
+  <%= agents_list(manifestation.creates[0..2]) %>
+  <%- if manifestation.creates.count > 5 -%>
+    (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, index_num: manifestation.id, mode: 'show_all_creators') %>'}); return false;"><%= t('page.show_all') %></a>)
   <%- end -%>
-  <% if defined?(EnjuSubject) %>
-    <% manifestation.classifications.each_with_index do |classification| %>
-      <%= link_to "#{classification.classification_type.display_name.localize}: #{classification.category}", manifestations_path(query: "classification_sm:#{classification.classification_type.name}_#{classification.category}") %>
-    <% end %>
-  <% end %>
+<%- end -%>
+
+<%= agents_list(manifestation.realizes) %>
+<%= agents_list(manifestation.produces) %>
+<%- if manifestation.pub_date.present? -%>
+  (<%= manifestation.pub_date -%>)
+<%- end -%>
+
+<% manifestation.classifications.each_with_index do |classification| %>
+  <%= link_to "#{classification.classification_type.display_name.localize}: #{classification.category}", manifestations_path(query: "classification_sm:#{classification.classification_type.name}_#{classification.category}") %>
+<% end %>

app/views/manifestations/_title.html+phone.erb

@@ -6,14 +6,14 @@
   </h2>
   <p>
     <%= manifestation.statement_of_responsibility %><br />
-    <%- unless manifestation.creators.readable_by(current_user).empty? -%>
-      <%= t('agent.creator') -%>: <%= agents_list(manifestation.creators.readable_by(current_user), itemprop: 'author') -%>
+    <%- unless manifestation.creates.empty? -%>
+      <%= t('agent.creator') -%>: <%= agents_list(manifestation.creates, itemprop: 'author') -%>
     <%- end -%>
-    <%- unless manifestation.contributors.readable_by(current_user).empty? -%>
-      <%= t('agent.contributor') -%>: <%= agents_list(manifestation.contributors.readable_by(current_user), itemprop: 'editor') -%>
+    <%- unless manifestation.realizes.empty? -%>
+      <%= t('agent.contributor') -%>: <%= agents_list(manifestation.realizes, itemprop: 'editor') -%>
     <%- end -%>
-    <%- unless manifestation.publishers.readable_by(current_user).empty? -%>
-      <%= t('agent.publisher') -%>: <%= agents_list(manifestation.publishers.readable_by(current_user), itemprop: 'publisher') -%>
+    <%- unless manifestation.produces.empty? -%>
+      <%= t('agent.publisher') -%>: <%= agents_list(manifestation.produces, itemprop: 'publisher') -%>
     <% end %>
     <%- if manifestation.date_of_publication? -%>
       <meta itemprop="publishDate" content="<%= manifestation.date_of_publication.iso8601 %>" />

app/views/manifestations/_title.html.erb

@@ -9,14 +9,14 @@
   </h2>
   <p>
     <%= manifestation.statement_of_responsibility %><br />
-    <%- unless manifestation.creators.readable_by(current_user).empty? -%>
-      <%= t('agent.creator') -%>: <%= agents_list(manifestation.creators.readable_by(current_user), itemprop: 'author') -%>
+    <%- unless manifestation.creates.empty? -%>
+      <%= t('agent.creator') -%>: <%= agents_list(manifestation.creates, itemprop: 'author') -%>
     <%- end -%>
-    <%- unless manifestation.contributors.readable_by(current_user).empty? -%>
-      <%= t('agent.contributor') -%>: <%= agents_list(manifestation.contributors.readable_by(current_user), itemprop: 'editor') -%>
+    <%- unless manifestation.realizes.empty? -%>
+      <%= t('agent.contributor') -%>: <%= agents_list(manifestation.realizes, itemprop: 'editor') -%>
     <%- end -%>
-    <%- unless manifestation.publishers.readable_by(current_user).empty? -%>
-      <%= t('agent.publisher') -%>: <%= agents_list(manifestation.publishers.readable_by(current_user), itemprop: 'publisher') -%>
+    <%- unless manifestation.produces.empty? -%>
+      <%= t('agent.publisher') -%>: <%= agents_list(manifestation.produces, itemprop: 'publisher') -%>
     <% end %>
     <%- if manifestation.date_of_publication? -%>
       <meta itemprop="publishDate" content="<%= manifestation.date_of_publication.iso8601 %>" />

app/views/manifestations/index.atom.builder

@@ -9,9 +9,9 @@ atom_feed(url: manifestations_url(format: :atom)) do |feed|
         entry.content(manifestation.tags.join(" "), type: "html")
       end
 
-      manifestation.creators.readable_by(current_user).each do |agent|
+      manifestation.creates.each do |create|
         entry.author do |author|
-          author.name(agent.full_name)
+          author.name(create.name)
         end
       end
     end

app/views/manifestations/index.opds.builder

@@ -14,9 +14,9 @@ atom_feed(url: manifestations_url(format: :atom),
         entry.content(manifestation.tags.join(" "), type: "html")
       end
 
-      manifestation.creators.readable_by(current_user).each do |agent|
+      manifestation.creates.each do |create|
         entry.author do |author|
-          author.name(agent.full_name)
+          author.name(create.name)
         end
       end
     end

app/views/manifestations/index.rss.builder

@@ -24,8 +24,8 @@ xml.rss("version" => "2.0",
           xml.title manifestation.original_title
           # xml.description(manifestation.original_title)
           # rfc822
-          manifestation.creators.readable_by(current_user).each do |creator|
-            xml.tag! "dc:creator", creator.full_name
+          manifestation.creates.each do |create|
+            xml.tag! "dc:creator", create.name
           end
           xml.pubDate manifestation.date_of_publication.try(:utc).try(:rfc822)
           xml.link manifestation_url(manifestation)

app/views/notifier/manifestation_info.en.text.erb

@@ -1,8 +1,8 @@
 <%= @user.username -%> :
 
 Title: <%= @manifestation.original_title %>
-Creator(s): <%= @manifestation.creators.readable_by(@user).collect(&:full_name).join("/") %>
-Contributor(s): <%= @manifestation.contributors.readable_by(@user).collect(&:full_name).join("/") %> 
+Creator(s): <%= @manifestation.creates.pluck(:name).join("/") %>
+Contributor(s): <%= @manifestation.realizes.pluck(:name).join("/") %> 
 Publisher(s): <%= @manifestation.publishers.readable_by(@user).collect(&:full_name).join("/") %>
 ISBN: <%= @manifestation.isbn_records.pluck(:body).join(" ") %>
 URL: <%= @manifestation.access_address %>

app/views/notifier/manifestation_info.ja.text.erb

@@ -1,8 +1,8 @@
 <%= @user.username -%> さん
 
 資料名: <%= @manifestation.original_title %>
-著者: <%= @manifestation.creators.readable_by(@user).collect(&:full_name).join("/") %>
-編者: <%= @manifestation.contributors.readable_by(@user).collect(&:full_name).join("/") %> 
+著者: <%= @manifestation.creates.pluck(:name).join("/") %>
+編者: <%= @manifestation.realizes.pluck(:name).join("/") %> 
 出版者: <%= @manifestation.publishers.readable_by(@user).collect(&:full_name).join("/") %>
 ISBN: <%= @manifestation.isbn_records.pluck(:body).join(" ") %>
 URL: <%= @manifestation.access_address %>