app/controllers/manifestations_controller.rb in enju_biblio-0.0.3 vs app/controllers/manifestations_controller.rb in enju_biblio-0.0.4

@@ -194,26 +194,29 @@
       if params[:format] == 'html' or params[:format].nil?
         @search_query = Digest::SHA1.hexdigest(Marshal.dump(search.query.to_params).force_encoding('UTF-8'))
         if flash[:search_query] == @search_query
           flash.keep(:search_query)
         else
-          #raise flash[:search_query].to_s
-          flash[:search_query] = @search_query
-          @manifestation_ids = search.build do
-            paginate :page => 1, :per_page => configatron.max_number_of_results
-          end.execute.raw_results.collect(&:primary_key).map{|id| id.to_i}
+          if @series_statement
+            flash.keep(:search_query)
+          else
+            flash[:search_query] = @search_query
+            @manifestation_ids = search.build do
+              paginate :page => 1, :per_page => configatron.max_number_of_results
+            end.execute.raw_results.collect(&:primary_key).map{|id| id.to_i}
+          end
         end
 
         if defined?(EnjuBookmark)
           if params[:view] == 'tag_cloud'
             unless @manifestation_ids
               @manifestation_ids = search.build do
                 paginate :page => 1, :per_page => configatron.max_number_of_results
               end.execute.raw_results.collect(&:primary_key).map{|id| id.to_i}
             end
-            #bookmark_ids = Bookmark.where(:manifestation_id => flash[:manifestation_ids]).limit(1000).select(:id).collect(&:id)
-            bookmark_ids = Bookmark.where(:manifestation_id => @manifestation_ids).limit(1000).select(:id).collect(&:id)
+            #bookmark_ids = Bookmark.where(:manifestation_id => flash[:manifestation_ids]).limit(1000).pluck(:id)
+            bookmark_ids = Bookmark.where(:manifestation_id => @manifestation_ids).limit(1000).pluck(:id)
             @tags = Tag.bookmarked(bookmark_ids)
             render :partial => 'manifestations/tag_cloud'
             return
           end
         end
@@ -330,11 +333,11 @@
     end
 
     case params[:mode]
     when 'send_email'
       if user_signed_in?
-        Notifier.delay.manifestation_info(current_user, @manifestation)
+        Notifier.manifestation_info(current_user.id, @manifestation.id).deliver
         flash[:notice] = t('page.sent_email')
         redirect_to @manifestation
         return
       else
         access_denied; return
@@ -347,11 +350,11 @@
     store_location
 
     if @manifestation.periodical_master?
       flash.keep(:notice) if flash[:notice]
       flash[:manifestation_id] = @manifestation.id
-      redirect_to series_statement_url(@manifestation.series_statement, :manifestation_id => @manifestation.id)
+      redirect_to series_statement_manifestations_url(@manifestation.series_statement)
       return
     end
 
     if defined?(EnjuCirculation)
       @reserved_count = Reserve.waiting.where(:manifestation_id => @manifestation.id, :checked_out_at => nil).count
@@ -590,11 +593,11 @@
     case sort_by
     when 'title'
       sort[:sort_by] = 'sort_title'
       sort[:order] = 'asc'
     when 'pub_date'
-      sort[:sort_by] = 'date_of_publication'
+      sort[:sort_by] = 'sort_date_of_publication'
       sort[:order] = 'desc'
     else
       # デフォルトの並び方
       sort[:sort_by] = 'created_at'
       sort[:order] = 'desc'
@@ -654,14 +657,14 @@
     patron = {}
     case
     when params[:patron_id]
       patron[:patron] = Patron.find(params[:patron_id])
     when params[:creator_id]
-      patron[:creator] = Patron.find(params[:creator_id])
+      patron[:creator] = @creator = Patron.find(params[:creator_id])
     when params[:contributor_id]
-      patron[:contributor] = Patron.find(params[:contributor_id])
+      patron[:contributor] = @contributor = Patron.find(params[:contributor_id])
     when params[:publisher_id]
-      patron[:publisher] = Patron.find(params[:publisher_id])
+      patron[:publisher] = @publisher = Patron.find(params[:publisher_id])
     end
     patron
   end
 
   def set_reservable