enju_biblio 0.1.0.pre33 → 0.1.0.pre34

data/app/models/resource_import_file.rb

@@ -108,7 +108,7 @@ class ResourceImportFile < ActiveRecord::Base
           m = Manifestation.find_by_isbn(isbn)
         end
         if m
-          unless m.series_statement
+          if m.series_statements.exists?
             manifestation = m
           end
         end
@@ -117,11 +117,9 @@ class ResourceImportFile < ActiveRecord::Base
 
       if row['original_title'].blank?
         unless manifestation
-          series_statement = find_series_statement(row)
           begin
             manifestation = Manifestation.import_isbn(isbn) if isbn
             if manifestation
-              manifestation.series_statement = series_statement
               num[:manifestation_imported] += 1
             end
           rescue EnjuNdl::InvalidIsbn
@@ -485,10 +483,14 @@ class ResourceImportFile < ActiveRecord::Base
       end_page = nil
     end
 
-    if row['fulltext_content'].to_s.strip == "t"
+    if row['fulltext_content'].to_s.downcase.strip == "t"
       fulltext_content = true
     end
 
+    if row['periodical'].to_s.downcase.strip == "t"
+      periodical = true
+    end
+
     creators = row['creator'].to_s.split('//')
     creator_transcriptions = row['creator_transcription'].to_s.split('//')
     creators_list = creators.zip(creator_transcriptions).map{|f,t| {:full_name => f.to_s.strip, :full_name_transcription => t.to_s.strip}}
@@ -504,11 +506,9 @@ class ResourceImportFile < ActiveRecord::Base
       publisher_patrons = Patron.import_patrons(publishers_list)
       #classification = Classification.where(:category => row['classification'].to_s.strip).first
       subjects = import_subject(row) if defined?(EnjuSubject)
-      series_statement = import_series_statement(row)
       case options[:edit_mode]
       when 'create'
         work = self.class.import_work(title, creator_patrons, options)
-        work.series_statement = series_statement
         if defined?(EnjuSubject)
           work.subjects = subjects.uniq unless subjects.empty?
         end
@@ -516,7 +516,6 @@ class ResourceImportFile < ActiveRecord::Base
       when 'update'
         expression = manifestation
         work = expression
-        work.series_statement = series_statement if series_statement
         work.creators = creator_patrons.uniq unless creator_patrons.empty?
         expression.contributors = contributor_patrons.uniq unless contributor_patrons.empty?
         if defined?(EnjuSubject)
@@ -579,7 +578,26 @@ class ResourceImportFile < ActiveRecord::Base
 
       manifestation.carrier_type = carrier_type if carrier_type
 
-      manifestation.series_statement = series_statement if series_statement
+      if row['series_original_title'].to_s.strip.present?
+        Manifestation.transaction do
+          if manifestation.series_statements.exists?
+            manifestation.series_statements.delete_all
+          end
+          series_title = row['series_original_title'].split('//')
+          series_title_transcription = row['series_title_transcription'].split('//')
+          series_statement = SeriesStatement.new(
+            :original_title => series_title[0],
+            :title_transcription => series_title_transcription[0],
+            :title_subseries => "#{series_title[1]} #{series_title[2]}",
+            :title_subseries_transcription => "#{series_title_transcription[1]} #{series_title_transcription[2]}",
+            :volume_number_string => series_title[0],
+            :creator_string => row['series_creator_string'],
+          )
+          series_statement.manifestation = manifestation
+          series_statement.save!
+        end
+      end
+
       manifestation.save!
 
       if options[:edit_mode] == 'create'
@@ -590,60 +608,6 @@ class ResourceImportFile < ActiveRecord::Base
     end
     manifestation
   end
-
-  def import_series_statement(row)
-    issn = StdNum::ISSN.normalize(row['issn'].to_s)
-    series_statement = find_series_statement(row)
-    unless series_statement
-      if row['series_title'].to_s.strip.present?
-        title = row['series_title'].to_s.strip.split('//')
-        title_transcription = row['series_title_transcription'].to_s.strip.split('//')
-        series_statement = SeriesStatement.new(
-          :original_title => title[0],
-          :title_transcription => title_transcription[0],
-          :series_statement_identifier => row['series_statement_identifier'].to_s.strip.split('//').first,
-          :title_subseries => "#{title[1]} #{title[2]}",
-          :title_subseries_transcription => "#{title_transcription[1]} #{title_transcription[2]}"
-        )
-        if issn.present?
-          series_statement.issn = issn
-        end
-        if row['periodical'].to_s.strip.present?
-          series_statement.periodical = true
-        end
-        series_statement.save!
-        if series_statement.periodical
-          SeriesStatement.transaction do
-            creators = row['series_statement_creator'].to_s.split('//')
-            creator_transcriptions = row['series_statement_creator_transcription'].to_s.split('//')
-            creators_list = creators.zip(creator_transcriptions).map{|f,t| {:full_name => f.to_s.strip, :full_name_transcription => t.to_s.strip}}
-            creator_patrons = Patron.import_patrons(creators_list)
-            series_statement.root_manifestation.creators = creator_patrons.uniq unless creator_patrons.empty?
-          end
-        end
-      end
-    end
-    if series_statement
-      series_statement
-    else
-      nil
-    end
-  end
-
-  def find_series_statement(row)
-    issn = StdNum::ISSN.normalize(row['issn'].to_s)
-    series_statement_identifier = row['series_statement_identifier'].to_s.strip
-    series_statement_id = row['series_statement_id'].to_s.strip
-    series_statement = SeriesStatement.where(:issn => issn).first if issn.present?
-    unless series_statement
-      series_statement = SeriesStatement.where(:series_statement_identifier => series_statement_identifier).first if series_statement_identifier.present?
-    end
-    unless series_statement
-      series_statement = SeriesStatement.where(:id => series_statement_id).first if series_statement_id
-    end
-    series_statement = SeriesStatement.where(:original_title => row['series_statement_original_title'].to_s.strip).first unless series_statement
-    series_statement
-  end
 end
 
 # == Schema Information

data/app/models/series_statement.rb

@@ -1,21 +1,19 @@
 class SeriesStatement < ActiveRecord::Base
   attr_accessible :original_title, :numbering, :title_subseries,
     :numbering_subseries, :title_transcription, :title_alternative,
-    :series_statement_identifier, :issn, :periodical, :note,
-    :title_subseries_transcription
+    :series_statement_identifier, :note,
+    :title_subseries_transcription, :creator_string, :volume_number_string
   attr_accessible :url, :frequency_id
 
-  has_many :series_has_manifestations, :dependent => :destroy
-  has_many :manifestations, :through => :series_has_manifestations
-  belongs_to :root_manifestation, :foreign_key => :root_manifestation_id, :class_name => 'Manifestation'
+  belongs_to :manifestation
+  belongs_to :manifestation, :foreign_key => :manifestation_id, :class_name => 'Manifestation'
   has_many :child_relationships, :foreign_key => 'parent_id', :class_name => 'SeriesStatementRelationship', :dependent => :destroy
   has_many :parent_relationships, :foreign_key => 'child_id', :class_name => 'SeriesStatementRelationship', :dependent => :destroy
   has_many :children, :through => :child_relationships, :source => :child
   has_many :parents, :through => :parent_relationships, :source => :parent
   belongs_to :frequency
   validates_presence_of :original_title
-  validate :check_issn
-  before_save :create_root_manifestation, :destroy_root_manifestation
+  before_save :create_manifestation
 
   acts_as_list
   searchable do
@@ -23,11 +21,8 @@ class SeriesStatement < ActiveRecord::Base
       titles
     end
     text :numbering, :title_subseries, :numbering_subseries
-    integer :manifestation_ids, :multiple => true do
-      series_has_manifestations.collect(&:manifestation_id)
-    end
+    integer :manifestation_id
     integer :position
-    boolean :periodical
     integer :series_statement_merge_list_ids, :multiple => true if defined?(EnjuResourceMerge)
     integer :parent_ids, :multiple => true do
       parents.pluck('series_statements.id')
@@ -38,58 +33,10 @@ class SeriesStatement < ActiveRecord::Base
   end
 
   attr_accessor :selected
-  normalize_attributes :original_title, :issn
+  normalize_attributes :original_title
 
   paginates_per 10
 
-  def last_issue
-    issue = manifestations.where('date_of_publication IS NOT NULL').order('date_of_publication DESC').first
-    unless issue
-      issues = manifestations.order('manifestations.id DESC').limit(2)
-      if issues[0] == root_manifestation
-        issue = issues[1]
-      else
-        issue = issues[0]
-      end
-    end
-    issue
-  end
-
-  def check_issn
-    self.issn = StdNum::ISSN.normalize(issn)
-    if issn.present?
-      unless StdNum::ISSN.valid?(issn)
-        errors.add(:issn)
-      end
-    end
-  end
-
-  def create_root_manifestation
-    return nil unless periodical
-    return nil if root_manifestation
-    SeriesStatement.transaction do
-      manifestation = Manifestation.create!(
-        :original_title => original_title
-      )
-      self.root_manifestation = manifestation
-      self.manifestations << manifestation
-    end
-  end
-
-  def destroy_root_manifestation
-    unless periodical
-      self.root_manifestation = nil
-    end
-  end
-
-  def first_issue
-    manifestations.order(:date_of_publication).first
-  end
-
-  def latest_issue
-    manifestations.order(:date_of_publication).last
-  end
-
   def manifestation_included(manifestation)
     series_has_manifestations.where(:manifestation_id => manifestation.id).first
   end
@@ -103,6 +50,16 @@ class SeriesStatement < ActiveRecord::Base
     ].flatten.compact
   end
 
+  def create_manifestation
+    return nil if manifestation
+    SeriesStatement.transaction do
+      manifestation = Manifestation.create!(
+        :original_title => original_title
+      )
+      self.manifestation = manifestation
+    end
+  end
+
   if defined?(EnjuResourceMerge)
     has_many :series_statement_merges, :dependent => :destroy
     has_many :series_statement_merge_lists, :through => :series_statement_merges
@@ -113,21 +70,23 @@ end
 #
 # Table name: series_statements
 #
-#  id                            :integer          not null, primary key
-#  original_title                :text
-#  numbering                     :text
-#  title_subseries               :text
-#  numbering_subseries           :text
-#  position                      :integer
-#  created_at                    :datetime         not null
-#  updated_at                    :datetime         not null
-#  title_transcription           :text
-#  title_alternative             :text
-#  series_statement_identifier   :string(255)
-#  issn                          :string(255)
-#  periodical                    :boolean          default(FALSE), not null
-#  root_manifestation_id         :integer
-#  note                          :text
-#  title_subseries_transcription :text
+#  id                                 :integer          not null, primary key
+#  original_title                     :text
+#  numbering                          :text
+#  title_subseries                    :text
+#  numbering_subseries                :text
+#  position                           :integer
+#  created_at                         :datetime         not null
+#  updated_at                         :datetime         not null
+#  title_transcription                :text
+#  title_alternative                  :text
+#  series_statement_identifier        :string(255)
+#  manifestation_id                   :integer
+#  note                               :text
+#  title_subseries_transcription      :text
+#  creator_string                     :text
+#  volume_number_string               :text
+#  volume_number_transcription_string :text
+#  series_master                      :boolean
 #
 

data/app/views/manifestations/_form.html.erb

@@ -2,30 +2,6 @@
 <%= simple_nested_form_for(@manifestation, :html => { :multipart => true }) do |f| -%>
   <%= f.error_messages -%>
 
-  <div class="field">
-    <%- if @manifestation.series_has_manifestation.try(:series_statement) -%>
-      <%= f.label t('activerecord.models.series_statement') -%>
-      <%= link_to @manifestation.series_has_manifestation.series_statement.original_title, @manifestation.series_has_manifestation.series_statement -%>
-      <% if @manifestation.new_record? %>
-        (<%= link_to t('series_statement.edit'), series_statements_path %>)
-      <% else %>
-        (<%= link_to t('series_statement.edit'), series_statements_path(:manifestation_id => @manifestation.id) -%>)
-      <% end %>
-    <%- else -%>
-      <%= f.label t('activerecord.models.series_statement') -%>
-      <% if @manifestation.new_record? %>
-        (<%= link_to t('page.listing', :model => t('activerecord.models.series_statement')), series_statements_path -%>)
-      <% else %>
-        (<%= link_to t('page.listing', :model => t('activerecord.models.series_statement')), manifestation_series_statements_path(@manifestation) -%>)
-      <%- end -%>
-    <%- end -%>
-    <% if @series_statement %>
-      <%= f.fields_for :series_has_manifestation do |s| %>
-        <%= s.hidden_field :series_statement_id %>
-      <% end %>
-    <% end %>
-  </div>
-
   <div class="field">
     <%= f.label :original_title -%><br />
     <%= f.text_field :original_title, :class => 'resource_title' -%>
@@ -39,6 +15,15 @@
     <%= f.text_field :title_alternative, :class => 'resource_title' -%>
   </div>
 
+  <div class="field">
+    <%= f.label :series_statement_string -%><br />
+    <%= f.fields_for :series_statements do |series_form| %>
+      <%= series_form.text_field :original_title %>
+      <%= series_form.link_to_remove t('page.remove') %>
+    <% end %>
+    <p><%= f.link_to_add t('page.add'), :series_statements %></p>
+  </div>
+
   <div class="field">
     <%= f.label :creator_string -%><br />
     <%= f.fields_for :creators do |creator_form| %>

data/app/views/manifestations/_manifestation.html.erb

@@ -1,8 +1,8 @@
           <tr class="line<%= cycle("0", "1") -%>">
             <td style="width: 30px"><%= @manifestations.offset_value + 1 + manifestation_counter -%></td>
             <td style="480px">
-              <% if manifestation.root_of_series? %>
-                <%= render 'manifestations/show_series_index', :manifestation => manifestation -%>
+              <% if manifestation.root_series_statement %>
+                <%= render 'manifestations/show_series_index', :manifestation => manifestation, :series_statement => manifestation.root_series_statement -%>
               <% else %>
                 <% cache([:manifestation => manifestation.id, :fragment => 'manifestation_html', :role => current_user_role_name, :locale => @locale]) do %>
                   <%= render 'manifestations/show_index', :manifestation => manifestation -%>
@@ -31,8 +31,8 @@
                   <% unless params[:mode] == 'add' %>
                     <%= link_to image_tag('icons/book_edit.png', :size => '16x16', :alt => t('page.edit')), edit_manifestation_path(manifestation) -%>
                     <% if @series_statement %>
-                      <% if manifestation.series_statement == @series_statement %>
-                        <%= link_to t('page.destroy'), series_statement_series_has_manifestation_path(manifestation.series_statement, manifestation.series_has_manifestation), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+                      <% if manifestation.root_series_statement == @series_statement %>
+                        <%= link_to t('page.destroy'), series_statement_series_has_manifestation_path(manifestation.root_series_statement, manifestation.series_has_manifestations.where(:series_statement_id => manifestation.root_series_statement.id).first), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
                       <% end %>
                     <% end %>
                   <% else %>
@@ -44,7 +44,7 @@
                     <% when @index_patron[:publisher] %>
                       <%= link_to t('page.add'), new_patron_produce_path(@index_patron[:publisher], :manifestation_id => manifestation.id) unless manifestation.publishers.include?(@index_patron[:publisher]) -%>
                     <% when @series_statement %>
-                      <% unless manifestation.series_statement -%>
+                      <% unless manifestation.series_statements.exists? -%>
                         <%= link_to t('page.add'), new_series_has_manifestation_path(:series_statement_id => @series_statement.id, :manifestation_id => manifestation.id) -%>
                       <% end %>
                     <% when @manifestation %>

data/app/views/manifestations/_show_detail_librarian.html.erb

@@ -10,11 +10,15 @@
             <td style="width: 500px"><%= manifestation.title_alternative -%></td>
           </tr>
         <% end %>
-        <%- if manifestation.series_statement -%>
+        <%- if manifestation.series_statements.exists? -%>
           <tr>
             <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
             <td style="width: 500px">
-              <%= link_to manifestation.series_statement.original_title, manifestation.series_statement -%>
+              <ul>
+                <% manifestation.series_statements.each do |series_statement| %>
+                  <li><%= link_to series_statement.original_title, series_statement -%></li>
+                <% end %>
+              </ul>
               <%= manifestation.volume_number_string %>
               <%- if manifestation.issn.present? -%>
                 (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)

data/app/views/manifestations/_show_detail_user.html.erb

@@ -10,11 +10,15 @@
             <td style="width: 500px"><%= manifestation.title_alternative -%></td>
           </tr>
         <% end %>
-        <%- if manifestation.series_statement -%>
+        <%- if manifestation.series_statements.exists? -%>
           <tr>
             <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
             <td style="width: 500px">
-              <%= link_to manifestation.series_statement.original_title, manifestation.series_statement -%>
+              <ul>
+                <% manifestation.series_statements.each do |series_statement| %>
+                  <li><%= link_to series_statement.original_title, series_statement -%></li>
+                <% end %>
+              </ul>
               <%= manifestation.volume_number_string %>
               <%- if manifestation.issn.present? -%>
                 (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)

data/app/views/manifestations/_show_index.html.erb

@@ -1,16 +1,11 @@
 <strong>
-  <% if manifestation.root_of_series? %>
-    <%= link_to manifestation.series_statement.original_title, series_statement_manifestations_path(manifestation.series_statement, :query => @query) %>
+  <% if manifestation.root_series_statement %>
+    <%= link_to manifestation.root_series_statement.original_title, series_statement_manifestations_path(manifestation.root_series_statement, :query => @query) %>
   <% else %>
     <%= link_to title_with_volume_number(manifestation), manifestation -%>
   <% end %>
 </strong>
-  <% if manifestation.periodical_master? %>
-    <%- if manifestation.series_statement.try(:first_issue) and manifestation.series_statement.try(:latest_issue) -%>
-      <%= manifestation.series_statement.first_issue.date_of_publication.try(:year) -%>
-      -
-      <%= manifestation.series_statement.latest_issue.date_of_publication.try(:year) -%>
-    <%- end -%>
+  <% if manifestation.series_master? %>
     <%= image_tag('icons/newspaper.png', :size => '16x16', :alt => t('manifestation.serial')) -%>
   <%- end -%>
   <%= link_to form_icon(manifestation.carrier_type), manifestation -%>

data/app/views/manifestations/_show_periodical_master.html.erb

@@ -1,40 +1,23 @@
-<%= render 'manifestations/title', :manifestation => @manifestation.series_statement.root_manifestation -%>
+<%= render 'manifestations/title', :manifestation => @manifestation.root_series_statement.manifestation -%>
 
 <p>
   <strong><%= t('activerecord.attributes.series_statement.original_title') -%></strong>
-  <%= @manifestation.series_statement.original_title %>
+  <%= @manifestation.root_series_statement.original_title %>
 </p>
 
 <p>
   <strong><%= t('activerecord.attributes.series_statement.title_transcription') -%></strong>
-  <%= @manifestation.series_statement.title_transcription %>
+  <%= @manifestation.root_series_statement.title_transcription %>
 </p>
 
 <p>
   <strong><%= t('activerecord.attributes.series_statement.issn') -%></strong>
-  <%= @manifestation.series_statement.issn %>
+  <%= @manifestation.root_series_statement.issn %>
 </p>
 
-<!--
-<p>
-  <strong><%= t('activerecord.attributes.series_statement.numbering') -%></strong>
-  <%= @manifestation.series_statement.numbering %>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.series_statement.title_subseries') -%></strong>
-  <%= @manifestation.series_statement.title_subseries %>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.series_statement.numbering_subseries') -%></strong>
-  <%= @manifestation.series_statement.numbering_subseries %>
-</p>
--->
-
 <p>
   <strong><%= t('activerecord.attributes.series_statement.series_statement_identifier') -%></strong>
-  <%= @manifestation.series_statement.series_statement_identifier %>
+  <%= @manifestation.root_series_statement.series_statement_identifier %>
 </p>
 
-<%= render 'series_statements/manifestation_list', :series_statement => @manifestation.series_statement -%>
+<%= render 'series_statements/manifestation_list', :series_statement => @manifestation.root_series_statement -%>

data/app/views/manifestations/_show_series_index.html.erb

@@ -1,12 +1,4 @@
-  <strong><%= link_to manifestation.series_statement.original_title, series_statement_manifestations_path(manifestation.series_statement, :query => @query) -%></strong>
-  <% if manifestation.periodical_master? %>
-    <%- if manifestation.series_statement.try(:first_issue) and manifestation.series_statement.try(:latest_issue) -%>
-      <%= manifestation.series_statement.first_issue.date_of_publication.try(:year) -%>
-      -
-      <%= manifestation.series_statement.latest_issue.date_of_publication.try(:year) -%>
-    <%- end -%>
-    <%= image_tag('icons/newspaper.png', :size => '16x16', :alt => t('manifestation.serial')) -%>
-  <%- end -%>
+  <strong><%= link_to series_statement.original_title, series_statement_manifestations_path(series_statement, :query => @query) -%></strong>
   <%= link_to form_icon(manifestation.carrier_type), manifestation -%>
   <%= link_to image_tag('icons/world_go.png', :size => '16x16', :alt => t('manifestation.web')), manifestation.access_address unless manifestation.access_address.blank? -%>
   <br />

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

@@ -87,7 +87,7 @@
               <li><%= link_to t('manifestation.edit_contributor'), expression_patrons_path(@manifestation) -%></li>
               <li><%= link_to t('manifestation.edit_publisher'), manifestation_patrons_path(@manifestation) -%></li>
               <%- if @manifestation.periodical? -%>
-                <li><%= link_to t('manifestation.add_next_issue'), new_series_statement_manifestation_path(@manifestation.series_statement) if @manifestation.series_statement -%></li>
+                <li><%= link_to t('manifestation.add_next_issue'), new_series_statement_manifestation_path(@manifestation.root_series_statement) if @manifestation.root_series_statement -%></li>
               <%- end -%>
             </ul>
           </li>

data/app/views/series_statements/_form.html.erb

@@ -16,14 +16,6 @@
     <%= f.label :title_transcription %><br />
     <%= f.text_field :title_transcription %>
   </div>
-  <div class="field">
-    <%= f.label :periodical %><br />
-    <%= f.check_box :periodical %>
-  </div>
-  <div class="field">
-    <%= f.label :issn %><br />
-    <%= f.text_field :issn %>
-  </div>
   <div class="field">
     <%= f.label :title_subseries %><br />
     <%= f.text_field :title_subseries %>

data/app/views/series_statements/_index.html.erb

@@ -29,23 +29,11 @@
     </td>
     <td>
       <strong><%= link_to series_statement.original_title, series_statement %></strong>
-      <%= image_tag('icons/newspaper.png', :size => '16x16', :alt => t('manifestation.serial')) if series_statement.periodical -%>
-      <% if series_statement.root_manifestation -%>
-        <% if series_statement.root_manifestation.publishers.exists? %>
+      <% if series_statement.manifestation -%>
+        <% if series_statement.manifestation.publishers.exists? %>
           <br />
-          <%= patrons_list(series_statement.root_manifestation.publishers.readable_by(current_user)) %>
+          <%= patrons_list(series_statement.manifestation.publishers.readable_by(current_user)) %>
         <% end %>
-      <% else %>
-        <% if series_statement.latest_issue %>
-          <% if series_statement.latest_issue.publishers.exists? %>
-            <br />
-            <%= patrons_list(series_statement.latest_issue.publishers.readable_by(current_user)) %>
-          <% end %>
-        <% end %>
-      <% end %>
-      <% if series_statement.issn? %>
-        <br />
-        ISSN: <%= series_statement.issn %>
       <% end %>
     </td>
     <td>
@@ -68,6 +56,4 @@
   <ul>
     <li><%= link_to t('page.new', :model => t('activerecord.models.series_statement')), new_series_statement_path -%></li>
   </ul>
-  <hr/>
-  <%= render 'periodical_facet' %>
 </div>

data/app/views/series_statements/_index_manifestation.html.erb

@@ -18,7 +18,6 @@
 <table class="table table-striped index">
   <tr>
     <th><%= t('activerecord.attributes.series_statement.original_title') -%></th>
-    <th><%= t('activerecord.attributes.series_statement.issn') -%></th>
     <th><%= t('activerecord.attributes.series_statement.series_statement_identifier') -%></th>
     <th></th>
   </tr>
@@ -26,22 +25,8 @@
 <% @series_statements.each do |series_statement| %>
   <tr class="line<%= cycle("0", "1") -%>">
     <td><%= link_to series_statement.original_title, series_statement %></td>
-    <td><%= series_statement.issn %></td>
     <td><%= series_statement.series_statement_identifier %></td>
     <td>
-      <%- if can? :create, SeriesHasManifestation -%>
-        <%- if params[:mode] == 'add' -%>
-          <% if @manifestation.series_has_manifestation %>
-            <% unless @manifestation.series_statement == series_statement %>
-              <%= link_to t('page.select'), edit_series_has_manifestation_path(@manifestation.series_has_manifestation, :series_statement_id => series_statement.id) -%>
-            <% end %>
-          <% else %>
-            <%= link_to t('page.select'), new_series_has_manifestation_path(:series_statement_id => series_statement.id, :manifestation_id => @manifestation.id) -%>
-          <% end %>
-        <%- else -%>
-          <%= link_to t('page.destroy'), manifestation_series_has_manifestation_path(@manifestation, series_statement.manifestation_included(@manifestation)), :data => {:confirm => t('page.are_you_sure')}, :method => :delete if series_statement.manifestation_included(@manifestation) -%>
-        <%- end -%>
-      <%- end -%>
     </td>
   </tr>
 <% end %>

data/app/views/series_statements/_index_parent.html.erb

@@ -20,7 +20,6 @@
 <table class="table table-striped index">
   <tr>
     <th><%= t('activerecord.attributes.series_statement.original_title') -%></th>
-    <th><%= t('activerecord.attributes.series_statement.issn') -%></th>
     <th><%= t('activerecord.attributes.series_statement.series_statement_identifier') -%></th>
     <th id="edit_icons"></th>
   </tr>
@@ -28,7 +27,6 @@
 <%- @series_statements.each do |series_statement| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td><%= link_to series_statement.original_title, series_statement -%></td>
-    <td><%= series_statement.issn -%></td>
     <td><%= series_statement.series_statement_identifier -%></td>
     <td>
       <%- if can? :update, series_statement -%>

data/app/views/series_statements/_index_series_statement_merge_list.html.erb

@@ -18,7 +18,6 @@
 <table class="table table-striped index">
   <tr>
     <th><%= t('activerecord.attributes.series_statement.original_title') -%></th>
-    <th><%= t('activerecord.attributes.series_statement.issn') -%></th>
     <th><%= t('activerecord.attributes.series_statement.series_statement_identifier') -%></th>
     <th id="edit_icons"></th>
   </tr>
@@ -26,7 +25,6 @@
 <%- @series_statements.each do |series_statement| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td><%= link_to series_statement.original_title, series_statement_merge_list_series_statement_path(@series_statement_merge_list, series_statement) -%></td>
-    <td><%= series_statement.issn -%></td>
     <td><%= series_statement.series_statement_identifier -%></td>
     <td>
       <%- if can? :delete, series_statement -%>

data/app/views/series_statements/_manifestation_list.html.erb

@@ -2,7 +2,7 @@
   <%= paginate(@manifestations, :param_name => :manifestation_page, :remote => true) -%>
   <table class="table table-striped index">
     <%- @manifestations.each do |manifestation| -%>
-      <% next if manifestation.periodical_master? %>
+      <% next if manifestation.series_master? %>
       <tr class="line<%= cycle("0", "1") -%>">
         <td>
           <%= render 'manifestations/show_index', :manifestation => manifestation %>