t#32471:add profiles

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

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index df0028c..14adc89 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -34,7 +34,7 @@ class PanelsController < ApplicationController
   end
 
   def show
-    @panel = Panel.show(params[:id], [@user, @admin])
+    @item = Panel.show(params[:id], [@user, @admin])
 
     respond_to do |format|
       format.html {
@@ -45,10 +45,10 @@ class PanelsController < ApplicationController
           @fresh_sheets = SheetPanel.mylist(@author, 1, 5).map {|sp| sp.sheet}
         end
       }
-      format.prof  { render :template => 'top/prof', :layout => true }
-      format.json { render json: @panel.panel_elements_as_json }
+      format_prof format
+      format.json { render json: @item.panel_elements_as_json }
       format.jsonp {
-        render :json => "callback(" + @panel.panel_elements_as_json + ");"
+        render :json => "callback(" + @item.panel_elements_as_json + ");"
       }
     end
   end