t#31650:remove tree

diff --git a/app/models/panel.rb b/app/models/panel.rb
index 919443b..7674df5 100644 (file)
--- a/app/models/panel.rb
+++ b/app/models/panel.rb
@@ -97,10 +97,6 @@ class Panel < ActiveRecord::Base
     self.tag_id + f.to_s
   end
   
-  def field_tree f
-    'panels-' + tag_panel_id + '-' + f.to_s
-  end
-  
   def self.default_page_size
     25
   end

diff --git a/app/views/panels/_form.html.erb b/app/views/panels/_form.html.erb
index cece9cf..2476140 100644 (file)
--- a/app/views/panels/_form.html.erb
+++ b/app/views/panels/_form.html.erb
@@ -12,24 +12,24 @@
 
       <div class="field">
         <%= f.label :caption %>
-        <%= f.text_field :caption, :id => @panel.field_tag_id(:caption), :panel_id => @panel.tag_panel_id, :column => :caption, :tree => @panel.field_tree(:caption) -%>
+        <%= f.text_field :caption, :id => @panel.field_tag_id(:caption), :panel_id => @panel.tag_panel_id, :column => :caption -%>
       </div>
       <div class="field">
         <%= f.label :width %>
-        <%= f.number_field :width, :size => 5, :id => @panel.field_tag_id(:width), :panel_id => @panel.tag_panel_id, :column => :width, :tree => @panel.field_tree(:width) %>
+        <%= f.number_field :width, :size => 5, :id => @panel.field_tag_id(:width), :panel_id => @panel.tag_panel_id, :column => :width %>
 
         <%= f.label :height %>
-        <%= f.number_field :height, :size => 5, :id => @panel.field_tag_id(:height), :panel_id => @panel.tag_panel_id, :column => :height, :tree => @panel.field_tree(:height) %>
+        <%= f.number_field :height, :size => 5, :id => @panel.field_tag_id(:height), :panel_id => @panel.tag_panel_id, :column => :height %>
 
         <%= f.label :border %>
-        <%= f.number_field :border, :size => 5, :id => @panel.field_tag_id(:border), :panel_id => @panel.tag_panel_id, :column => :border, :tree => @panel.field_tree(:border) %>
+        <%= f.number_field :border, :size => 5, :id => @panel.field_tag_id(:border), :panel_id => @panel.tag_panel_id, :column => :border %>
       </div>
       <div class="field">
         <%= f.label :publish %>
-        <%= f.collection_select :publish, t_select_items(MagicNumber['panel_visible_items']), :last, :first, {:html => {:selected => @panel.publish}}, {:id => @panel.field_tag_id(:publish), :panel_id => @panel.tag_panel_id, :column => :publish, :tree => @panel.field_tree(:publish)} %>
+        <%= f.collection_select :publish, t_select_items(MagicNumber['panel_visible_items']), :last, :first, {:html => {:selected => @panel.publish}}, {:id => @panel.field_tag_id(:publish), :panel_id => @panel.tag_panel_id, :column => :publish} %>
       </div>
       <% unless @panel.new_record?  %>
-        <%= f.hidden_field :id, :id => @panel.field_tag_id(:id), :panel_id => @panel.tag_panel_id, :column => :id, :tree => @panel.field_tree(:id) %>
+        <%= f.hidden_field :id, :id => @panel.field_tag_id(:id), :panel_id => @panel.tag_panel_id, :column => :id %>
       <% end %>
       <div class="actions">
         <%= f.submit 'panels.submit', :class => "submit" %>