X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fpanels_controller.rb;h=76b3f0654b323b550dbf6421bc61b6c3a9217f28;hb=6fb8bc9e0e2b4ee9840f42e2915598db46b9a4b8;hp=fb76c25d0e704d096f0ac094ef20004b06467fcd;hpb=387de02ada617308cad50c4bd35e8dbb05c28be4;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index fb76c25d..76b3f065 100644
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -8,7 +8,6 @@ class PanelsController < ApplicationController
     before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy, :catch]
     before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy, :catch]
   end
-  before_filter :authenticate_admin!, :only => [:list, :browse]
   
   def self.model
     Panel
@@ -43,23 +42,6 @@ class PanelsController < ApplicationController
     end
   end
   
-  def list
-    @panels = Panel.all :order => 'updated_at'
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @panels }
-    end
-  end
-
-  def browse
-    @panel = Panel.find(params[:id])
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-    end
-  end
-
   def new
     @panel = Panel.new
     @panel.supply_default
@@ -72,7 +54,7 @@ class PanelsController < ApplicationController
   end
 
   def edit
-    @panel = Panel.edit(params[:id], @author)
+    @panel = Panel.edit(params[:id], @operators)
     respond_to do |format|
       format.html
       format.js
@@ -88,7 +70,7 @@ class PanelsController < ApplicationController
     end
     @prm = params[:panel] || jsn
     respond_to do |format|
-      if @panel.store @prm, @author
+      if @panel.store @prm, @operators
         flash[:notice] = I18n.t('flash.notice.created', :model => Panel.model_name.human)
         format.html { redirect_to @panel }
         format.json { render json: @panel.panel_elements_as_json, status: :created, location: @panel }
@@ -100,14 +82,14 @@ class PanelsController < ApplicationController
   end
 
   def update
-    @panel = Panel.edit(params[:id], @author)
+    @panel = Panel.edit(params[:id], @operators)
     jsn = nil
     if params[:json]
       jsn = JSON.parse(params[:json])
     end
     @prm = params[:panel] || jsn
     respond_to do |format|
-      if @panel.store @prm, @author
+      if @panel.store @prm, @operators
         flash[:notice] = I18n.t('flash.notice.updated', :model => Panel.model_name.human)
         format.html { redirect_to @panel }
         format.json { head :ok }
@@ -119,7 +101,7 @@ class PanelsController < ApplicationController
   end
 
   def destroy
-    @panel = Panel.edit(params[:id], @author)
+    @panel = Panel.edit(params[:id], @operators)
     respond_to do |format|
       Panel.transaction do
         if @panel.destroy_with_elements
@@ -136,11 +118,11 @@ class PanelsController < ApplicationController
   end
   
   def catch
-    @panel = Panel.edit(params[:id], @author)
+    @panel = Panel.edit(params[:id], @operators)
 
     respond_to do |format|
-      @author.working_panel_id = @panel.id
-      if @author.save
+      @operators.author.working_panel_id = @panel.id
+      if @operators.author.save
         format.html { redirect_to @panel }
       else
       end