add editor

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

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index 52a544c..a632462 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -95,9 +95,13 @@ class PanelsController < ApplicationController
   def new
     @panel = Panel.new
     @panel.supply_default
-
     respond_to do |format|
-      format.html
+      format.html {
+        @editor = Editor::Editor.new @panel, @operators
+        render :template => 'templates/r/editor/editor', :locals => {
+          :editor => @editor
+        }
+      }
       format.js
       format.json { render json: @panel.panel_elements_as_json }
     end
@@ -106,7 +110,12 @@ class PanelsController < ApplicationController
   def edit
     @panel = Panel.edit(params[:id], @operators)
     respond_to do |format|
-      format.html
+      format.html {
+        @editor = Editor::Editor.new @panel, @operators
+        render :template => 'templates/r/editor/editor', :locals => {
+          :editor => @editor
+        }
+      }
       format.js
     end
   end