summaryrefslogtreecommitdiff
path: root/chef-server-webui/app/controllers/databag_items.rb
diff options
context:
space:
mode:
Diffstat (limited to 'chef-server-webui/app/controllers/databag_items.rb')
-rw-r--r--chef-server-webui/app/controllers/databag_items.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/chef-server-webui/app/controllers/databag_items.rb b/chef-server-webui/app/controllers/databag_items.rb
index 00310008f0..c3da721740 100644
--- a/chef-server-webui/app/controllers/databag_items.rb
+++ b/chef-server-webui/app/controllers/databag_items.rb
@@ -38,7 +38,7 @@ class DatabagItems < Application
begin
@databag_item = Chef::DataBagItem.new
@databag_item.data_bag params[:databag_id]
- @databag_item.raw_data = JSON.parse(params[:json_data])
+ @databag_item.raw_data = Chef::JSON.from_json(params[:json_data])
raise ArgumentError, "Updating id is not allowed" unless @databag_item.raw_data['id'] == params[:id] #to be consistent with other objects, changing id is not allowed.
@databag_item.save
redirect(url(:databag_databag_items, :databag_id => params[:databag_id], :id => @databag_item.name), :message => { :notice => "Updated Databag Item #{@databag_item.name}" })
@@ -61,7 +61,7 @@ class DatabagItems < Application
@databag_name = params[:databag_id]
@databag_item = Chef::DataBagItem.new
@databag_item.data_bag @databag_name
- @databag_item.raw_data = JSON.parse(params[:json_data])
+ @databag_item.raw_data = Chef::JSON.from_json(params[:json_data])
@databag_item.create
redirect(url(:databag_databag_items, :databag_id => @databag_name), :message => { :notice => "Databag item created successfully" })
rescue => e