diff --git a/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb b/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
index ee19a2691..e69bd50af 100644
--- a/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
+++ b/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
@@ -1,7 +1,7 @@
 class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
   include AdminHelper
 
-  before_filter :force_order_for_user, :except => [:index,:get_album_json]
+  before_filter :force_order_for_user, :except => [:index,:get_album_json,:get_img_json]
 
   def index
     if is_manager? || is_admin? || is_sub_manager?
@@ -119,37 +119,42 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
 
     albums.each do |album|
       tag_names = Array.new
-      all_image = Array.new
-
-      images = album.gallery_images.all
-      images.each do |image|
-        tags = Array.new
-
-        image.tag_ids.each do |tag|
-          tags << GalleryTag.find(tag)[I18n.locale]
-        end
-
-        all_image << {
-          image_title: image.title,
-          image_description: image.description,
-          image_file: { url: "http://#{request.host_with_port}#{image.file.url}",
-                        thumb: "http://#{request.host_with_port}#{image.file.thumb.to_s}"},
-          image_tag_names: tags}
-      end
 
       album.tag_ids.each do |tag|
         tag_names << GalleryTag.find(tag)[I18n.locale]
       end
+
       output << {
-                  album_cover_file: "http://#{request.host_with_port}#{album.cover_path}",
-                  album_name: album.name,
-                  album_tag_names: tag_names,
-                  images: all_image
+        album_cover_file: "http://#{request.host_with_port}#{album.cover_path}",
+        album_name: album.name,
+        album_tag_names: tag_names,
+        album_link:"http://#{request.host_with_port}"
       }
     end
 
-    #render :json=>{:images => @output,
-    #               :tag_names  => @tag_names}.to_json
+    render :json=>JSON.pretty_generate(output)
+  end
+
+  def get_img_json
+    album = GalleryAlbum.find(params[:album_id])
+    images = album.gallery_images.all
+    output = Array.new
+
+    images.each do |image|
+      tags = Array.new
+
+      image.tag_ids.each do |tag|
+        tags << GalleryTag.find(tag)[I18n.locale]
+      end
+
+      all_image << {
+        image_title: image.title,
+        image_description: image.description,
+        image_file: { url: "http://#{request.host_with_port}#{image.file.url}",
+                      thumb: "http://#{request.host_with_port}#{image.file.thumb.to_s}"},
+                      image_tag_names: tags}
+    end
+
     render :json=>JSON.pretty_generate(output)
   end
 
diff --git a/vendor/built_in_modules/gallery/config/routes.rb b/vendor/built_in_modules/gallery/config/routes.rb
index 8795594b0..a3877d0a1 100644
--- a/vendor/built_in_modules/gallery/config/routes.rb
+++ b/vendor/built_in_modules/gallery/config/routes.rb
@@ -6,11 +6,14 @@ Rails.application.routes.draw do
         match "upload_image" => "albums#upload_image"
         match "save_tags" => "tags#save_tags"
         match "albums/save_tags" => "tags#save_tags"
+
         resources :albums do 
           match "set_cover" => "albums#set_cover"
           match "imgs" => "albums#imgs"
           match "upload_panel" => "albums#upload_panel"
           match "images_tags" => "albums#images_tags"
+          match "get_img_json/:album_id" => "album_images#get_img_json"
+
           collection do
             get "get_album_json"
           end