fixing CHEF-969, 970, and 971

8 files changed, 20 insertions, 20 deletions

diff --git a/chef-server-webui/app/controllers/databag_items.rb b/chef-server-webui/app/controllers/databag_items.rb
index 2255695d61..e3ee5b27d5 100644
--- a/chef-server-webui/app/controllers/databag_items.rb
+++ b/chef-server-webui/app/controllers/databag_items.rb
@@ -29,7 +29,7 @@ class ChefServerWebui::DatabagItems < ChefServerWebui::Application
       @default_data = @databag_item
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      @_message = { :error => $! }   
+      @_message = { :error => "Could not load the databag item" }   
     end 
     render
   end 
@@ -44,7 +44,7 @@ class ChefServerWebui::DatabagItems < ChefServerWebui::Application
       redirect(slice_url(:databag_databag_items, :databag_id => params[:databag_id], :id => @databag_item.name), :message => { :notice => "Updated Databag Item #{@databag_item.name}" })
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      @_message = { :error => $! }
+      @_message = { :error => "Could not update the databag item" }
       @databag_item = Chef::DataBagItem.load(params[:databag_id], params[:id])
       @default_data = @databag_item
       render :edit 
@@ -63,10 +63,10 @@ class ChefServerWebui::DatabagItems < ChefServerWebui::Application
       @databag_item.data_bag @databag_name
       @databag_item.raw_data = JSON.parse(params[:json_data])
       @databag_item.create
-      redirect(slice_url(:databag_databag_items, :databag_id => @databag_name), :message => { :notice => "Created Databag Item #{@databag_item.name}" })
+      redirect(slice_url(:databag_databag_items, :databag_id => @databag_name), :message => { :notice => "Databag item created successfully" })
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      @_message = { :error => $! } 
+      @_message = { :error => "Could not create databag item" } 
       render :new
     end
   end
@@ -84,7 +84,7 @@ class ChefServerWebui::DatabagItems < ChefServerWebui::Application
       display @databag_item
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      redirect(slice_url(:databag_databag_items), {:message => { :error => $! }, :permanent => true})
+      redirect(slice_url(:databag_databag_items), {:message => { :error => "Could not show the databag item" }, :permanent => true})
     end 
   end
   
@@ -92,10 +92,10 @@ class ChefServerWebui::DatabagItems < ChefServerWebui::Application
     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})
+      redirect(slice_url(:databag_databag_items), {:message => { :notice => "Databag item deleted successfully" }, :permanent => true})
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      redirect(slice_url(:databag_databag_items), {:message => { :error => $! }, :permanent => true})
+      redirect(slice_url(:databag_databag_items), {:message => { :error => "Could not delete databag item" }, :permanent => true})
     end 
   end 
   
diff --git a/chef-server-webui/app/controllers/databags.rb b/chef-server-webui/app/controllers/databags.rb
index d7172803dc..edbf283ac3 100644
--- a/chef-server-webui/app/controllers/databags.rb
+++ b/chef-server-webui/app/controllers/databags.rb
@@ -36,7 +36,7 @@ class ChefServerWebui::Databags < ChefServerWebui::Application
       redirect(slice_url(:databags), :message => { :notice => "Created Databag #{@databag.name}" })
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      @_message = { :error => $! } 
+      @_message = { :error => "Could not create databag" } 
       render :new
     end 
   end
@@ -46,7 +46,7 @@ class ChefServerWebui::Databags < ChefServerWebui::Application
                   Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("data")
                 rescue => e
                   Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-                  @_message = { :error => $! } 
+                  @_message = { :error => "Could not list databags" } 
                   {}
                 end
     render
@@ -62,7 +62,7 @@ class ChefServerWebui::Databags < ChefServerWebui::Application
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @databags = Chef::DataBag.list
-      @_message =  { :error => $!}    
+      @_message =  { :error => "Could not load databag"}    
       render :index
     end 
   end
@@ -75,7 +75,7 @@ class ChefServerWebui::Databags < ChefServerWebui::Application
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @databags = Chef::DataBag.list
-      @_message =  { :error => $!}
+      @_message =  { :error => "Could not delete databag"}
       render :index
     end 
   end
diff --git a/chef-server-webui/app/controllers/nodes.rb b/chef-server-webui/app/controllers/nodes.rb
index 5391e65517..408884efd5 100644
--- a/chef-server-webui/app/controllers/nodes.rb
+++ b/chef-server-webui/app/controllers/nodes.rb
@@ -32,7 +32,7 @@ class ChefServerWebui::Nodes < ChefServerWebui::Application
                     Chef::Node.list 
                   rescue => e
                     Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-                    @_message = {:error => $!}
+                    @_message = {:error => "Could not list nodes"}
                     {}
                   end 
     render
@@ -59,7 +59,7 @@ class ChefServerWebui::Nodes < ChefServerWebui::Application
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @node_list = Chef::Node.list()
-      @_message = {:error => $!}
+      @_message = {:error => "Could not load available recipes, roles, or the run list"}
       render :index
     end 
   end
diff --git a/chef-server-webui/app/controllers/roles.rb b/chef-server-webui/app/controllers/roles.rb
index 545d262c56..128c1f8190 100644
--- a/chef-server-webui/app/controllers/roles.rb
+++ b/chef-server-webui/app/controllers/roles.rb
@@ -30,7 +30,7 @@ class ChefServerWebui::Roles < ChefServerWebui::Application
                    Chef::Role.list()
                   rescue => e
                     Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-                    @_message = {:error => $!}
+                    @_message = {:error => "Could not list roles"}
                     {}
                   end 
     render
diff --git a/chef-server-webui/app/controllers/search.rb b/chef-server-webui/app/controllers/search.rb
index 75eb310407..45bcd7f818 100644
--- a/chef-server-webui/app/controllers/search.rb
+++ b/chef-server-webui/app/controllers/search.rb
@@ -29,7 +29,7 @@ class ChefServerWebui::Search < ChefServerWebui::Application
                         @s.list_indexes
                       rescue => e
                         Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-                        @_message = {:error => $!}
+                        @_message = {:error => "Could not list search indexes"}
                         {}
                       end 
     render
diff --git a/chef-server-webui/app/controllers/status.rb b/chef-server-webui/app/controllers/status.rb
index 7054272ec9..b4a20ec35a 100644
--- a/chef-server-webui/app/controllers/status.rb
+++ b/chef-server-webui/app/controllers/status.rb
@@ -31,7 +31,7 @@ class ChefServerWebui::Status < ChefServerWebui::Application
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @status = {}
-      @_message = {:error => $!}
+      @_message = {:error => "Could not list status"}
       render
     end 
   end
diff --git a/chef-server-webui/app/controllers/users.rb b/chef-server-webui/app/controllers/users.rb
index 32bfb519ac..39c08089d0 100644
--- a/chef-server-webui/app/controllers/users.rb
+++ b/chef-server-webui/app/controllers/users.rb
@@ -135,7 +135,7 @@ class ChefServerWebui::Users < ChefServerWebui::Application
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @user = Chef::WebUIUser.new
-      @_message = { :error => $! }
+      @_message = { :error => "Could not complete logging in." }
       render :login
     end   
   end
diff --git a/chef-server-webui/app/views/roles/index.html.haml b/chef-server-webui/app/views/roles/index.html.haml
index ed1677bf06..ee38369d8e 100644
--- a/chef-server-webui/app/views/roles/index.html.haml
+++ b/chef-server-webui/app/views/roles/index.html.haml
@@ -7,13 +7,13 @@
       .inner
         %table.table
           %tr
-            %th.first Name
-            %th 
+            %th.first{:colspan => 2} Name
+            %th &nbsp;
             %th.last &nbsp;
           - even = false;
           - @role_list.each do |role|
             %tr{ :class => even ? "even" : "odd" }
-              %td= link_to(role[0], slice_url(:role, role[0]))
+              %td{:colspan => 2}= link_to(role[0], slice_url(:role, role[0]))
               %td
                 = link_to('Edit', slice_url(:edit_role, role[0])) 
                 |