Fix backend gallery show page go_back issue and theater exit fullscreen

This commit is contained in:
manson committed 2014-07-21 16:28:09 +08:00
1 parent 6f2ca20be3
commit 1825842ad0
6 files changed
+47 -19

No files matched your search

+13 -6
View File
@@ -10,15 +10,12 @@ class Admin::GalleriesController < ApplicationController
def show
@album = Album.find(params[:id])
@images = @album.album_images
@image_content = []
image_content = []
@images.each do |image|
@image_content << {"id" => image.id.to_s, "description" => image.description_translations,"tags" => image.tags.collect{|t| t.id.to_s}}
image_content << {"id" => image.id.to_s, "description" => image.description_translations,"tags" => image.tags.collect{|t| t.id.to_s}}
end
@tags = @module_app.tags
respond_to do |h|
h.html
h.json {render json: @image_content}
end
@photos_data = {"galleries" => image_content}.to_json
end
def new
@@ -61,6 +58,16 @@ class Admin::GalleriesController < ApplicationController
render :json =>{"success"=>true}.to_json
end
def get_photoData_json
@album = Album.find(params[:id])
@images = @album.album_images
image_content = []
@images.each do |image|
image_content << {"id" => image.id.to_s, "description" => image.description_translations,"tags" => image.tags.collect{|t| t.id.to_s}}
end
render :json=>{"galleries" => image_content}.to_json
end
def get_album_json
albums = Album.all
output = Array.new