X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fground_colors_controller.rb;h=c9be0d39948e2c3a55291a7538b6258ec5fc38d6;hb=2788400e911d92496bf76bbae44021353b287ba0;hp=5346ff146c0c6312c780ad9253431a75eee29c33;hpb=6871c7b0c1a7a02d4fe3b8ff597f3978e4df7f89;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/ground_colors_controller.rb b/app/controllers/ground_colors_controller.rb
index 5346ff14..c9be0d39 100644
--- a/app/controllers/ground_colors_controller.rb
+++ b/app/controllers/ground_colors_controller.rb
@@ -1,30 +1,40 @@
 class GroundColorsController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-  if MagicNumber['run_mode'] == 0
-    before_filter :authenticate_user, :only => []
+  if Manifest.manifest.magic_numbers['run_mode'] == 0
+    before_action :authenticate_user, :only => []
+    before_action :authenticate_author, :only => []
   else
-    before_filter :authenticate_reader, :only => [:index, :show]
-    before_filter :authenticate_user, :only => []
+    before_action :authenticate_reader, :only => [
+      :index, :show, :by_panel, :by_author
+    ]
+    before_action :authenticate_user, :only => []
+    before_action :authenticate_author, :only => []
   end
-
-  # GET /ground_colors
-  # GET /ground_colors.json
+  
   def index
-    @page = GroundColor.page params[:page]
-    @page_size = GroundColor.page_size params[:page_size]
-    @ground_colors = GroundColor.list(@page, @page_size)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render :json => @ground_colors.to_json(GroundColor.list_json_opt) }
-    end
+    filer_list
+  end
+  
+  def by_panel
+    filer_list param: params[:id]
+  end
+  
+  def by_author
+    filer_list param: params[:id]
+  end
+  
+  def show_html_format format
+    format.html {
+      @ground_color = @item
+    }
   end
   
   def show
-    @ground_color = GroundColor.show(params[:id], @author)
+    set_show
     respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @ground_color.to_json(GroundColor.show_json_opt) }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
+  
 end