t#30009:fix views

[pettanr/pettanr.git] / app / controllers / home_controller.rb

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 9d296c1..83142c5 100644 (file)
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,5 +1,5 @@
 class HomeController < ApplicationController
-  layout 'test' if Pettanr::TestLayout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [
     :index, :show, :profile, :configure, :create_token, :delete_token, :step2, :save_step2, :step3, :save_step3, 
     :comic, :panel, :picture, :panel_picture, :panel_color, :ground_picture, :ground_color
@@ -86,18 +86,7 @@ class HomeController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @panels.to_json() }
-    end
-  end
-  
-  def picture
-    @page = OriginalPicture.page params[:page]
-    @page_size = OriginalPicture.page_size params[:page_size]
-    @original_pictures = OriginalPicture.mylist(@artist.id, @page, @page_size)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @original_pictures.to_json(OriginalPicture.list_json_opt) }
+      format.json { render text: Panel.list_as_json_text(@panels) }
     end
   end