t#32342:fix panel hide

diff --git a/app/assets/javascripts/panels.js.coffee b/app/assets/javascripts/panels.js.coffee
index 37735c9..9106de7 100644 (file)
--- a/app/assets/javascripts/panels.js.coffee
+++ b/app/assets/javascripts/panels.js.coffee
@@ -39,6 +39,14 @@ $ ->
     if Object.keys(rules).length > 0\r
       v = form.validate({ignore:[],rules: rules})\r
   \r
+  display_panel = (panel, vis) ->\r
+    v = if vis\r
+      ''\r
+    else\r
+      'none'\r
+    trace = editor.panel_tag_id(panel)\r
+    $(trace).css('display', v)\r
+  \r
   validate_panel = (form) ->\r
     valid = form.valid()\r
     bc = if valid\r
@@ -47,6 +55,7 @@ $ ->
       '#ef29ef'\r
     $('a', $('#tabs-1-tab')).map ->\r
       $(@).css('background-color', bc)\r
+    display_panel(form, valid)\r
     valid\r
   \r
   display_element = (element, vis) ->\r

diff --git a/app/views/panels/_form.html.erb b/app/views/panels/_form.html.erb
index 0045143..4f4e208 100644 (file)
--- a/app/views/panels/_form.html.erb
+++ b/app/views/panels/_form.html.erb
@@ -10,7 +10,7 @@
     <li id="tabs-5-tab"><a href="#tabs-5">new</a></li>
   </ul>
   <div id="tabs-1">
-    <%= form_for(@panel, :html => {:id => @panel.tag_id('form'), 'data-form-name' => 'panel'}) do |f| %>
+    <%= form_for(@panel, :html => @panel.tag_attributes('form', 'data-form-name' => 'panel')) do |f| %>
       <%= render 'system/error_explanation', :obj => @panel %>
 
       <div class="field">
@@ -182,4 +182,4 @@
     </div>
   <% end %>
 </div>
-  <%= text_field_tag "json", '', :id => 'pettanr-configurations' %>
+  <%# text_field_tag "json", '', :id => 'pettanr-configurations' %>

diff --git a/script/preup.rb b/script/preup.rb
index cc55dcc..c902cb4 100644 (file)
--- a/script/preup.rb
+++ b/script/preup.rb
@@ -32,14 +32,14 @@ Dir.glob(dirname + '/*') do |fn|
         puts 'get attributes.json'\r
         attr = nil\r
         File.open(attrfn, 'r') do |f|\r
-          attr = f.read\r
+          attr = JSON.parse(f.read)\r
         end\r
         json = JSON.parse(open(ls).read)\r
         if json['attributes'] and attr\r
           json['attributes'] = attr\r
         end\r
         File.open(lsfn, 'w') do |f|\r
-          f.write json.to_json.to_s\r
+          f.write JSON.pretty_generate(json)\r
         end\r
       else\r
         FileUtils.cp ls, lsfn\r