From 47075944e78641e235ae17ede2b4d9b412f2f1aa Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Thu, 15 Nov 2012 12:11:58 +0800 Subject: [PATCH] make gallery json format to two layer --- .../gallery/back_end/albums_controller.rb | 8 +- .../built_in_modules/gallery/config/routes.rb | 105 +++++++++--------- 2 files changed, 57 insertions(+), 56 deletions(-) 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 e69bd50a..2499d08f 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,:get_img_json] + before_filter :force_order_for_user, :except => [:index,:get_album_json,:get_imgs_json] def index if is_manager? || is_admin? || is_sub_manager? @@ -128,14 +128,14 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController 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}" + album_link:"http://#{request.host_with_port}#{panel_gallery_back_end_album_get_imgs_json_path(album)}" } end render :json=>JSON.pretty_generate(output) end - def get_img_json + def get_imgs_json album = GalleryAlbum.find(params[:album_id]) images = album.gallery_images.all output = Array.new @@ -147,7 +147,7 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController tags << GalleryTag.find(tag)[I18n.locale] end - all_image << { + output << { image_title: image.title, image_description: image.description, image_file: { url: "http://#{request.host_with_port}#{image.file.url}", diff --git a/vendor/built_in_modules/gallery/config/routes.rb b/vendor/built_in_modules/gallery/config/routes.rb index 2ca337e3..11569091 100644 --- a/vendor/built_in_modules/gallery/config/routes.rb +++ b/vendor/built_in_modules/gallery/config/routes.rb @@ -2,61 +2,62 @@ Rails.application.routes.draw do namespace :panel do namespace :gallery do - namespace :back_end do - match "get_albums" => "albums#get_albums" - 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" + namespace :back_end do + match "get_albums" => "albums#get_albums" + 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_imgs_json" => "albums#get_imgs_json" - collection do - get "get_album_json" - end - end + collection do + get "get_album_json" + end + end - match "album_images/#!/:id" => "album_images#show" - - resources :album_images - resources :gallery_categories - resources :tags - end + match "album_images/#!/:id" => "album_images#show" + + resources :album_images + resources :gallery_categories + resources :tags + end - namespace :front_end do - match "orbit_galleries" => "orbit_galleries#index" - match "get_albums" => "albums#get_albums" - # match "orbit_galleries" => "orbit_galleries#index" - # match "gallery_category_save" => "orbit_galleries#new_category" - # match "categorylist" => "orbit_galleries#categorylist" - # match "gallery_category_delete" => "orbit_galleries#gallery_category_delete" - # match "add_album" => "orbit_galleries#add_album" - # match "create_album" => "orbit_galleries#create_album" - # match "get_albums" => "orbit_galleries#get_albums" - # match "upload_image" => "orbit_galleries#upload_image" - # match "upload_panel" => "orbit_galleries#upload_panel" - # match "get_images" => "orbit_galleries#get_images" - # match "theater" => "orbit_galleries#theater" - # match "delete_album" => "orbit_galleries#delete_album" - # match "edit_album" => "orbit_galleries#edit_album" - # match "set_cover" => "orbit_galleries#set_cover" - # match "delete_images" => "orbit_galleries#delete_images" - # match "update_album" => "orbit_galleries#update_album" - # match "save_tags" => "orbit_galleries#save_tags" - resources :albums do - member do - get "imgs" - get "theater" - end - end - resources :album_images - end - namespace :widget do - match "widget1" => "albums#widget1" - end + namespace :front_end do + match "orbit_galleries" => "orbit_galleries#index" + match "get_albums" => "albums#get_albums" + # match "orbit_galleries" => "orbit_galleries#index" + # match "gallery_category_save" => "orbit_galleries#new_category" + # match "categorylist" => "orbit_galleries#categorylist" + # match "gallery_category_delete" => "orbit_galleries#gallery_category_delete" + # match "add_album" => "orbit_galleries#add_album" + # match "create_album" => "orbit_galleries#create_album" + # match "get_albums" => "orbit_galleries#get_albums" + # match "upload_image" => "orbit_galleries#upload_image" + # match "upload_panel" => "orbit_galleries#upload_panel" + # match "get_images" => "orbit_galleries#get_images" + # match "theater" => "orbit_galleries#theater" + # match "delete_album" => "orbit_galleries#delete_album" + # match "edit_album" => "orbit_galleries#edit_album" + # match "set_cover" => "orbit_galleries#set_cover" + # match "delete_images" => "orbit_galleries#delete_images" + # match "update_album" => "orbit_galleries#update_album" + # match "save_tags" => "orbit_galleries#save_tags" + resources :albums do + member do + get "imgs" + get "theater" + end + end + resources :album_images + end + + namespace :widget do + match "widget1" => "albums#widget1" + end end end end