t#30200:update i18n devise

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

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index a138cba..c0cd0cf 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -1,6 +1,7 @@
 class PanelsController < ApplicationController
-  layout 'test' if Pettanr::TestLayout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index, :show, :new, :edit, :create, :update, :destroy]
+  before_filter :authenticate_author, :only => [:index, :show, :new, :edit, :create, :update, :destroy]
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
   public
@@ -14,7 +15,7 @@ class PanelsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render text: '[' + @panels.map {|i| i.panel_elements_as_json }.join(',') + ']' }
+      format.json { render text: Panel.list_as_json_text(@panels) }
     end
   end