t#30169:show, index action create all resource

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

diff --git a/app/controllers/colors_controller.rb b/app/controllers/colors_controller.rb
index 6c3ae00..82a2b2a 100644 (file)
--- a/app/controllers/colors_controller.rb
+++ b/app/controllers/colors_controller.rb
@@ -5,8 +5,8 @@ class ColorsController < ApplicationController
   # 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|
@@ -15,6 +15,14 @@ class ColorsController < ApplicationController
     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