enju_biblio 0.1.0.pre2 → 0.1.0.pre3

data/app/controllers/carrier_types_controller.rb

@@ -1,5 +1,6 @@
 class CarrierTypesController < InheritedResources::Base
   respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update

data/app/controllers/content_types_controller.rb

@@ -1,5 +1,6 @@
 class ContentTypesController < InheritedResources::Base
   respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update
@@ -10,8 +11,4 @@ class ContentTypesController < InheritedResources::Base
     end
     update!
   end
-
-  def index
-    @content_types = @content_types.page(params[:page])
-  end
 end

data/app/controllers/countries_controller.rb

@@ -1,5 +1,6 @@
 class CountriesController < InheritedResources::Base
   respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update
@@ -10,8 +11,4 @@ class CountriesController < InheritedResources::Base
     end
     update!
   end
-
-  def index
-    @countries = @countries.page(params[:page])
-  end
 end

data/app/controllers/create_types_controller.rb

@@ -1,5 +1,6 @@
 class CreateTypesController < InheritedResources::Base
   respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update

data/app/controllers/extents_controller.rb

@@ -1,5 +1,6 @@
 class ExtentsController < InheritedResources::Base
   respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update
@@ -10,8 +11,4 @@ class ExtentsController < InheritedResources::Base
     end
     update!
   end
-
-  def index
-    @extents = @extents.page(params[:page])
-  end
 end

data/app/controllers/form_of_works_controller.rb

@@ -1,5 +1,6 @@
 class FormOfWorksController < InheritedResources::Base
   respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update

data/app/controllers/frequencies_controller.rb

@@ -1,5 +1,6 @@
 class FrequenciesController < InheritedResources::Base
   respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update

data/app/controllers/languages_controller.rb

@@ -1,5 +1,6 @@
 class LanguagesController < InheritedResources::Base
   respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update
@@ -10,8 +11,4 @@ class LanguagesController < InheritedResources::Base
     end
     update!
   end
-
-  def index
-    @languages = @languages.page(params[:page])
-  end
 end

data/app/controllers/licenses_controller.rb

@@ -1,5 +1,6 @@
 class LicensesController < InheritedResources::Base
   respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update
@@ -10,8 +11,4 @@ class LicensesController < InheritedResources::Base
     end
     update!
   end
-
-  def index
-    @licenses = @licenses.page(params[:page])
-  end
 end

data/app/controllers/manifestation_relationship_types_controller.rb

@@ -1,5 +1,6 @@
 class ManifestationRelationshipTypesController < InheritedResources::Base
   respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update

data/app/controllers/manifestation_relationships_controller.rb

@@ -1,11 +1,9 @@
 class ManifestationRelationshipsController < InheritedResources::Base
+  respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
   before_filter :prepare_options, :except => [:index, :destroy]
 
-  def prepare_options
-    @manifestation_relationship_types = ManifestationRelationshipType.all
-  end
-
   def new
     @manifestation_relationship = ManifestationRelationship.new(params[:manifestation_relationship])
     @manifestation_relationship.parent = Manifestation.find(params[:manifestation_id]) rescue nil
@@ -20,4 +18,9 @@ class ManifestationRelationshipsController < InheritedResources::Base
     end
     update!
   end
+
+  private
+  def prepare_options
+    @manifestation_relationship_types = ManifestationRelationshipType.all
+  end
 end

data/app/controllers/manifestations_controller.rb

@@ -264,7 +264,7 @@ class ManifestationsController < ApplicationController
       end
 
       if defined?(EnjuSearchLog)
-        save_search_history(query, @manifestations.limit_value, @count[:query_result], current_user)
+        save_search_history(query, @manifestations.offset_value + 1, @count[:query_result], current_user)
       end
 
       if defined?(EnjuOai)

data/app/controllers/medium_of_performances_controller.rb

@@ -1,5 +1,6 @@
 class MediumOfPerformancesController < InheritedResources::Base
   respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update
@@ -10,8 +11,4 @@ class MediumOfPerformancesController < InheritedResources::Base
     end
     update!
   end
-
-  def index
-    @medium_of_performances = @medium_of_performances.page(params[:page])
-  end
 end

data/app/controllers/patron_relationship_types_controller.rb

@@ -1,5 +1,6 @@
 class PatronRelationshipTypesController < InheritedResources::Base
   respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update

data/app/controllers/patron_relationships_controller.rb

@@ -1,11 +1,9 @@
 class PatronRelationshipsController < InheritedResources::Base
+  respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
   before_filter :prepare_options, :except => [:index, :destroy]
 
-  def prepare_options
-    @patron_relationship_types = PatronRelationshipType.all
-  end
-
   def new
     @patron_relationship = PatronRelationship.new(params[:patron_relationship])
     @patron_relationship.parent = Patron.find(params[:patron_id]) rescue nil
@@ -20,4 +18,9 @@ class PatronRelationshipsController < InheritedResources::Base
     end
     update!
   end
+
+  private
+  def prepare_options
+    @patron_relationship_types = PatronRelationshipType.all
+  end
 end

data/app/controllers/patron_types_controller.rb

@@ -1,5 +1,6 @@
 class PatronTypesController < InheritedResources::Base
   respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update
@@ -10,8 +11,4 @@ class PatronTypesController < InheritedResources::Base
     end
     update!
   end
-
-  def index
-    @patron_types = @patron_types.page(params[:page])
-  end
 end

data/app/controllers/produce_types_controller.rb

@@ -1,5 +1,6 @@
 class ProduceTypesController < InheritedResources::Base
   respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update

data/app/controllers/realize_types_controller.rb

@@ -1,5 +1,6 @@
 class RealizeTypesController < InheritedResources::Base
   respond_to :html, :json
+  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update

data/app/controllers/series_has_manifestations_controller.rb

@@ -56,6 +56,7 @@ class SeriesHasManifestationsController < ApplicationController
         format.html { redirect_to @series_has_manifestation, :notice => t('controller.successfully_created', :model => t('activerecord.models.series_has_manifestation')) }
         format.json { render :json => @series_has_manifestation, :status => :created, :location => @series_has_manifestation }
       else
+        @series_statement = @series_has_manifestation.series_statement
         format.html { render :action => "new" }
         format.json { render :json => @series_has_manifestation.errors, :status => :unprocessable_entity }
       end
@@ -73,6 +74,7 @@ class SeriesHasManifestationsController < ApplicationController
         format.html { redirect_to @series_has_manifestation, :notice => t('controller.successfully_updated', :model => t('activerecord.models.series_has_manifestation')) }
         format.json { head :no_content }
       else
+        @series_statement = @series_has_manifestation.series_statement
         format.html { render :action => "edit" }
         format.json { render :json => @series_has_manifestation.errors, :status => :unprocessable_entity }
       end

data/app/controllers/series_statement_relationships_controller.rb

@@ -0,0 +1,20 @@
+class SeriesStatementRelationshipsController < InheritedResources::Base
+  respond_to :html, :json
+  has_scope :page, :default => 1
+  load_and_authorize_resource
+
+  def new
+    @series_statement_relationship = SeriesStatementRelationship.new(params[:series_statement_relationship])
+    @series_statement_relationship.parent = SeriesStatement.find(params[:parent_id]) rescue nil
+    @series_statement_relationship.child = SeriesStatement.find(params[:child_id]) rescue nil
+  end
+
+  def update
+    @series_statement_relationship = SeriesStatementRelationship.find(params[:id])
+    if params[:move]
+      move_position(@series_statement_relationship, params[:move])
+      return
+    end
+    update!
+  end
+end

data/app/controllers/series_statements_controller.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 class SeriesStatementsController < ApplicationController
   load_and_authorize_resource
-  before_filter :get_work, :get_manifestation, :except => [:create, :update, :destroy]
+  before_filter :get_work, :get_manifestation, :get_parent_and_child, :except => [:create, :update, :destroy]
   cache_sweeper :page_sweeper, :only => [:create, :update, :destroy]
   after_filter :solr_commit, :only => [:create, :update, :destroy]
   if defined?(EnjuResourceMerge)
@@ -25,13 +25,21 @@ class SeriesStatementsController < ApplicationController
     end
     #work = @work
     manifestation = @manifestation
+    parent = @parent
+    child = @child
     series_statement_merge_list = @series_statement_merge_list
     unless params[:mode] == 'add'
       search.build do
       #  with(:work_id).equal_to work.id if work
+        with(:parent_ids).equal_to parent.id if parent
+        with(:child_ids).equal_to child.id if child
         with(:manifestation_ids).equal_to manifestation.id if manifestation
         with(:series_statement_merge_list_ids).equal_to series_statement_merge_list.id if series_statement_merge_list
       end
+    else
+      search.build do
+        without(:parent_ids, parent.id) if parent
+      end
     end
     page = params[:page] || 1
     search.query.paginate(page.to_i, SeriesStatement.default_per_page)
@@ -46,6 +54,9 @@ class SeriesStatementsController < ApplicationController
   # GET /series_statements/1
   # GET /series_statements/1.json
   def show
+    #@manifestations = @series_statement.manifestations.order('date_of_publication DESC').page(params[:manifestation_page]).per(Manifestation.default_per_page)
+    #store_location
+
     respond_to do |format|
       format.html { # show.html.erb
         redirect_to series_statement_manifestations_url(@series_statement)
@@ -62,6 +73,8 @@ class SeriesStatementsController < ApplicationController
   # GET /series_statements/new.json
   def new
     @series_statement = SeriesStatement.new
+    @frequencies = Frequency.all
+    @series_statement.parent = @parent_series_statement if @parent_series_statement
 
     respond_to do |format|
       format.html # new.html.erb
@@ -72,6 +85,8 @@ class SeriesStatementsController < ApplicationController
   # GET /series_statements/1/edit
   def edit
     @series_statement.work = @work if @work
+    @frequencies = Frequency.all
+    @series_statement.parent = @parent_series_statement if @parent_series_statement
   end
 
   # POST /series_statements
@@ -86,6 +101,7 @@ class SeriesStatementsController < ApplicationController
         format.html { redirect_to @series_statement, :notice => t('controller.successfully_created', :model => t('activerecord.models.series_statement')) }
         format.json { render :json => @series_statement, :status => :created, :location => @series_statement }
       else
+        @frequencies = Frequency.all
         format.html { render :action => "new" }
         format.json { render :json => @series_statement.errors, :status => :unprocessable_entity }
       end
@@ -105,6 +121,7 @@ class SeriesStatementsController < ApplicationController
         format.html { redirect_to @series_statement, :notice => t('controller.successfully_updated', :model => t('activerecord.models.series_statement')) }
         format.json { head :no_content }
       else
+        @frequencies = Frequency.all
         format.html { render :action => "edit" }
         format.json { render :json => @series_statement.errors, :status => :unprocessable_entity }
       end
@@ -121,4 +138,10 @@ class SeriesStatementsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def get_parent_and_child
+    @parent = SeriesStatement.find(params[:parent_id]) if params[:parent_id]
+    @child = SeriesStatement.find(params[:child_id]) if params[:child_id]
+  end
 end

data/app/models/picture_file.rb

@@ -21,6 +21,8 @@ class PictureFile < ActiveRecord::Base
   # http://railsforum.com/viewtopic.php?id=11615
   acts_as_list :scope => 'picture_attachable_type=\'#{picture_attachable_type}\''
   normalize_attributes :picture_attachable_type
+
+  paginates_per 10
 end
 
 # == Schema Information

data/app/models/series_statement.rb

@@ -7,6 +7,11 @@ class SeriesStatement < ActiveRecord::Base
   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'
+  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
+
   validates_presence_of :original_title
   validate :check_issn
   before_save :create_root_manifestation
@@ -18,17 +23,23 @@ class SeriesStatement < ActiveRecord::Base
     end
     text :numbering, :title_subseries, :numbering_subseries
     integer :manifestation_ids, :multiple => true do
-      series_has_manifestations.pluck(:manifestation_id)
+      series_has_manifestations.collect(&:manifestation_id)
     end
     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')
+    end
+    integer :child_ids, :multiple => true do
+      children.pluck('series_statements.id')
+    end
   end
 
+  attr_accessor :selected
   normalize_attributes :original_title, :issn
-  paginates_per 10
 
-  attr_accessor :selected
+  paginates_per 10
 
   def last_issue
     manifestations.where('date_of_publication IS NOT NULL').order('date_of_publication DESC').first || manifestations.order(:id).last
@@ -68,7 +79,12 @@ class SeriesStatement < ActiveRecord::Base
   end
 
   def titles
-    [original_title, title_transcription]
+    [
+      original_title,
+      title_transcription,
+      parents.map{|parent| [parent.original_title, parent.title_transcription]},
+      children.map{|child| [child.original_title, child.title_transcription]}
+    ].flatten.compact
   end
 
   if defined?(EnjuResourceMerge)

data/app/models/series_statement_relationship.rb

@@ -0,0 +1,17 @@
+class SeriesStatementRelationship < ActiveRecord::Base
+  attr_accessible :child_id, :parent_id
+  belongs_to :parent, :foreign_key => 'parent_id', :class_name => 'SeriesStatement'
+  belongs_to :child, :foreign_key => 'child_id', :class_name => 'SeriesStatement'
+  after_save :reindex
+  after_destroy :reindex
+
+  validates_presence_of :parent_id, :child_id
+  validates_uniqueness_of :child_id, :scope => :parent_id
+  acts_as_list :scope => :parent_id
+
+  def reindex
+    parent.try(:index)
+    child.try(:index)
+    Sunspot.commit
+  end
+end

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

@@ -101,7 +101,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.item.acquired_at') -%>:</strong>
-  <%= l(@item.acquired_at, :formats => :only_date) if @item.acquired_at -%>
+  <%= l(@item.acquired_at, :format => :only_date) if @item.acquired_at -%>
 </p>
 
 <p>