fixing databags, adding error handling.

Author: Nuo Yan

chef-server-webui/app/controllers/databag_items.rb

@@ -78,17 +78,25 @@ def index
   end
 
   def show
-    @databag_name = params[:databag_id]
-    @databag_item_name = params[:id]
-    r = Chef::REST.new(Chef::Config[:chef_server_url])
-    @databag_item = r.get_rest("data/#{params[:databag_id]}/#{params[:id]}")
-    display @databag_item
+    begin
+      @databag_name = params[:databag_id]
+      @databag_item_name = params[:id]
+      r = Chef::REST.new(Chef::Config[:chef_server_url])
+      @databag_item = r.get_rest("data/#{params[:databag_id]}/#{params[:id]}")
+      display @databag_item
+    rescue
+      redirect(slice_url(:databag_databag_items), {:message => { :error => $! }, :permanent => true})
+    end 
   end
 
   def destroy(databag_id=params[:databag_id], item_id=params[:id])
-    @databag_item = Chef::DataBagItem.new
-    @databag_item.destroy(databag_id, item_id)
-    redirect(slice_url(:databag_databag_items), {:message => { :notice => "Databag Item #{params[:id]} deleted successfully" }, :permanent => true})
+    begin
+      @databag_item = Chef::DataBagItem.new
+      @databag_item.destroy(databag_id, item_id)
+      redirect(slice_url(:databag_databag_items), {:message => { :notice => "Databag Item #{params[:id]} deleted successfully" }, :permanent => true})
+    rescue
+      redirect(slice_url(:databag_databag_items), {:message => { :error => $! }, :permanent => true})
+    end 
   end 
 
 end

chef-server-webui/app/controllers/databags.rb

@@ -41,9 +41,15 @@ def create
   end
 
   def index
-    r = Chef::REST.new(Chef::Config[:chef_server_url])
-    @databags = r.get_rest("data")
-    render
+    begin
+      r = Chef::REST.new(Chef::Config[:chef_server_url])
+      @databags = r.get_rest("data")
+      render
+    rescue
+      @_message = { :error => $! } 
+      @databags = {}
+      render
+    end
   end
 
   def show

chef-server-webui/app/views/databag_items/show.html.haml

@@ -6,4 +6,4 @@
     .content
       .inner
         .accordion
-          = build_tree('attrs', @dababag_item, @databag_item)
+          = build_tree('attrs', @databag_item)

chef-server-webui/app/views/databags/index.html.haml

@@ -13,6 +13,6 @@
               %tr{:class => "#{index % 2 == 1 ? 'odd' : 'even'}"}
                 %td= link_to databag[0], slice_url(:databag, { :id => databag[0] })
                 %td
-                  = link_to('Edit', slice_url(:edit_databag, :id => databag[0])) 
+                  = link_to('Edit', slice_url(:databag, :id => databag[0])) 
                   |
                   = link_to('Delete', slice_url(:databag, :id => databag[0]), :method => "delete", :confirm => "Really delete Databag #{databag[0]}?  There is no undo.")