ref: refs/heads/master
commit 4b412a978b44916e441009335182bb3db77ec920
Author: Duncan Mac-Vicar P
Date: Mon Oct 26 15:09:11 2009 +0100
make status summary use the default error handling instead of its own
---
.../status/app/controllers/status_controller.rb | 16 +++++++---------
.../app/views/status/_status_summary.html.erb | 16 ++--------------
webclient/lib/error_constructor.rb | 4 ++++
3 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/plugins/status/app/controllers/status_controller.rb b/plugins/status/app/controllers/status_controller.rb
index b0530b3..c6a2a2b 100644
--- a/plugins/status/app/controllers/status_controller.rb
+++ b/plugins/status/app/controllers/status_controller.rb
@@ -170,18 +170,16 @@ class StatusController < ApplicationController
def show_summary
return unless client_permissions
- unless create_data
+ begin
+ create_data
+ status = limits_reached
+ status = "limits exceeded for " + status unless status.empty?
+ render :partial => "status_summary", :locals => { :status => status, :error => nil }
+ rescue Exception => error
erase_redirect_results #reset all redirects
erase_render_results
- error = flash[:error]
- flash.clear #no flash from load_proxy
- render :partial => "status_summary", :locals => { :status => nil, :error => error }
- return false
+ render :partial => "status_summary", :locals => { :status => nil, :error => error } and return
end
- status = limits_reached
- status = "limits exceeded for " + status unless status.empty?
-
- render :partial => "status_summary", :locals => { :status => status, :error => nil }
end
def save
diff --git a/plugins/status/app/views/status/_status_summary.html.erb b/plugins/status/app/views/status/_status_summary.html.erb
index 57378c0..c12d3d7 100644
--- a/plugins/status/app/views/status/_status_summary.html.erb
+++ b/plugins/status/app/views/status/_status_summary.html.erb
@@ -1,21 +1,9 @@
-<% if !error.blank? %>
-<script type="text/javascript">
-$(document).ready(function() {
- $('#details-link').click(function() { $('#details-link').hide();$('#details-text').show();return false; });
-});
-</script>
-<% end %>
+<%= report_error(error, _("An error occured when loading status information.")) if error %>
<div class="status_status">
<% unless status %>
<div class="status-icon warning"></div>
- <span><%= _("An error occured when loading status information.") %></span>
- <% if !error.blank? %>
- <a href="#" id="details-link"><%=_("Show details...")%></a>
- <div id="details-text" style="display: none">
- <%= h error %>
- </div>
- <% end %>
+ <span><%= _("No status information available") %></span>
<% else %>
<% link_to "status" do %>
<% if !status.blank? %>
diff --git a/webclient/lib/error_constructor.rb b/webclient/lib/error_constructor.rb
index 58ec8bf..575a8c9 100644
--- a/webclient/lib/error_constructor.rb
+++ b/webclient/lib/error_constructor.rb
@@ -6,6 +6,10 @@ module ErrorConstructor
error = error["error"]
case error["type"]
+ when "SERVICE_NOT_AVAILABLE"
+ return _("Service %s is not available in the target machine") % [error["service"]]
+ when "SERVICE_NOT_RUNNING"
+ return _("Service %s is not running on the target machine") % [error["service"]]
when "NO_PERM"
return _("Permission %s is not granted for user %s") % [error["permission"], error["user"]]
when "POLKIT"
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
