app/controllers/manifestations_controller.rb in enju_biblio-0.1.0.pre60 vs app/controllers/manifestations_controller.rb in enju_biblio-0.1.0.pre61

@@ -62,11 +62,11 @@
         end
       end
 
       set_reservable if defined?(EnjuCirculation)
 
-      manifestations, sort, @count = {}, {}, {}
+      sort, @count = {}, {}
       query = ""
 
       if params[:format] == 'txt'
         per_page = 65534
       end
@@ -94,13 +94,12 @@
 
       # 絞り込みを行わない状態のクエリ
       @query = query.dup
       query = query.gsub('　', ' ')
 
-      includes = [:carrier_type, :series_statements]
+      includes = [:items, :root_series_statement]
       includes << :bookmarks if defined?(EnjuBookmark)
       search = Manifestation.search(include: includes)
-      role = current_user.try(:role) || Role.default_role
       case @reservable
       when 'true'
         reservable = true
       when 'false'
         reservable = false