t#30137:fix authenticate

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

diff --git a/app/controllers/colors_controller.rb b/app/controllers/colors_controller.rb
index 00ea365..82a2b2a 100644 (file)
--- a/app/controllers/colors_controller.rb
+++ b/app/controllers/colors_controller.rb
@@ -1,11 +1,12 @@
 class ColorsController < ApplicationController
-  layout 'test' if Pettanr::TestLayout
+  layout 'test' if MagicNumber['test_layout']
+  before_filter :authenticate_admin!, :only => [:list]
   
   # GET /colors
   # GET /colors.json
   def index
-    @page = PanelColor.page params[:page]
-    @page_size = PanelColor.page_size params[:page_size]
+    @page = Color.page params[:page]
+    @page_size = Color.page_size params[:page_size]
     @colors = Color.list(@page, @page_size)
 
     respond_to do |format|
@@ -13,4 +14,21 @@ class ColorsController < ApplicationController
       format.json { render json: @colors.to_json(Color.list_json_opt) }
     end
   end
+  
+  def show
+    @color = Color.show(params[:id], @author)
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @color.to_json(Color.show_json_opt) }
+    end
+  end
+
+  def list
+    @colors = Color.all
+
+    respond_to do |format|
+      format.html { render layout: 'system' }# index.html.erb
+      format.json { render json: @colors }
+    end
+  end
 end