app/controllers/manifestations_controller.rb in enju_biblio-0.1.0.pre66 vs app/controllers/manifestations_controller.rb in enju_biblio-0.1.0.pre67
- old
+ new
@@ -94,11 +94,12 @@
# 絞り込みを行わない状態のクエリ
@query = query.dup
query = query.gsub(' ', ' ')
- includes = [:items, :root_series_statement]
+ includes = [:root_series_statement]
+ includes << :classifications if defined?(EnjuSubject)
includes << :bookmarks if defined?(EnjuBookmark)
search = Manifestation.search(include: includes)
case @reservable
when 'true'
reservable = true
@@ -417,10 +418,10 @@
}
format.rdf
format.mods
format.json { render json: @manifestation }
#format.atom { render template: 'manifestations/oai_ore' }
- #format.js
+ format.js
format.download {
if @manifestation.attachment.path
if ENV['ENJU_STORAGE'] == 's3'
send_data data, filename: File.basename(@manifestation.attachment_file_name), type: 'application/octet-stream'
else