developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated image json with albums

This commit is contained in:
saurabhbhatia 2013-11-22 15:22:22 +08:00
parent e0e5dd7a3f
commit 8af5112d24
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb vendored
View File

@ -107,11 +107,17 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
image.tag_ids.each do |tag| image.tag_ids.each do |tag|
tags << get_tags.include?(tag) tags << get_tags.include?(tag)
end end
if image.file.theater.present?
@image_file = image.file.theater.url
else
@image_file = image.file.url
end
output << { output << {
image_title: image.title, image_title: image.title,
image_description: image.description, image_description: image.description,
image_file: { url: "http://#{request.host_with_port}#{image.file.url}", image_file: { url: "http://#{request.host_with_port}#{@image_file}",
thumb: "http://#{request.host_with_port}#{image.file.thumb.to_s}"}, thumb: "http://#{request.host_with_port}#{image.file.thumb.to_s}"},
image_tag_names: tags} image_tag_names: tags}
end end