added the new JSON editor

Nuo Yan · Nuo Yan · commit 927a74d22c2b · 2009-11-17T11:23:20.000-08:00
diff --git a/chef-server-webui/app/views/databag_items/_form.html.haml b/chef-server-webui/app/views/databag_items/_form.html.haml
@@ -2,11 +2,10 @@
   .inner
     %div.group.form
       %label.label Data
-      %div.editor
-        %div#tree
-        %div#jform
-        %div.clear
-        %script= "$(document).ready(function() { JSONeditor.start('tree', 'jform', #{@default_data.to_json} , false); });"
+    %div.group.form{:style => "position:relative;"}
+      %label.label Attributes 
+      = partial '../layout/jsonedit', :json =>@default_data.to_json
+
 
     = form(:action => form_url, :method => :post, :id => form_id, :class => 'form') do
       %div.group
diff --git a/chef-server-webui/public/javascripts/chef.js b/chef-server-webui/public/javascripts/chef.js
@@ -56,7 +56,7 @@ $(document).ready(function(){
       form.append('<input type="hidden" name="_method" value="put">');
     }
     form.append('<input type="hidden" id="json_data" name="json_data"/>');
-    form.append($('input#json_data').attr('value', JSONeditor.treeBuilder.JSONstring.make(JSONeditor.treeBuilder.json)))
+    form.append($('input#json_data').attr('value', BCJTEP.save()));
   });
 
 	$('form#edit_databag, form#create_databag').submit(function(event) {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ $(document).ready(function(){`
`56`	`56`	`form.append('<input type="hidden" name="_method" value="put">');`
`57`	`57`	`}`
`58`	`58`	`form.append('<input type="hidden" id="json_data" name="json_data"/>');`
`59`		`- form.append($('input#json_data').attr('value', JSONeditor.treeBuilder.JSONstring.make(JSONeditor.treeBuilder.json)))`
	`59`	`+ form.append($('input#json_data').attr('value', BCJTEP.save()));`
`60`	`60`	`});`
`61`	`61`
`62`	`62`	`$('form#edit_databag, form#create_databag').submit(function(event) {`