fixed for settings.

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

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 9f5c0c1..49129f9 100644 (file)
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,14 +1,10 @@
 class HomeController < ApplicationController
   layout 'test' if MagicNumber['test_layout']
-  before_filter :authenticate_user!, :only => [
+  before_filter :authenticate_user, :only => [
     :index, :show, :profile, :configure, :create_token, :delete_token, 
-    :comic, :story, :panel, :picture, :panel_picture, :panel_color, :ground_picture, :ground_color
+    :comic, :story, :panel, :resource_picture, :panel_picture, :panel_color, :ground_picture, :ground_color
   ]
-  before_filter :authenticate_author, :only => [
-    :index, :show, :profile, :configure, :create_token, :delete_token, 
-    :comic, :story, :panel, :picture, :panel_picture, :panel_color, :ground_picture, :ground_color
-  ]
-  before_filter :authenticate_artist, :only => [:picture]
+  before_filter :authenticate_artist, :only => [:resource_picture]
   
   def index
   end
@@ -120,4 +116,15 @@ class HomeController < ApplicationController
     end
   end
   
+  def resource_picture
+    @page = Author.page params[:page]
+    @page_size = Author.panel_page_size params[:page_size]
+    @resource_pictures = ResourcePicture.mylist(@author, @page, @page_size)
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @resource_pictures.to_json(ResourcePicture.list_json_opt) }
+    end
+  end
+  
 end