ref: refs/heads/master
commit 99aec805f3160f339c829fa3aec60d6b6266fb67
Author: Ladislav Slezak
Date: Thu Jul 23 15:05:44 2009 +0200
Display details when the current status cannot be read
---
.../status/app/controllers/status_controller.rb | 5 +++--
.../app/views/status/_status_summary.html.erb | 14 ++++++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/plugins/status/app/controllers/status_controller.rb b/plugins/status/app/controllers/status_controller.rb
index 114c57a..501926b 100644
--- a/plugins/status/app/controllers/status_controller.rb
+++ b/plugins/status/app/controllers/status_controller.rb
@@ -162,8 +162,9 @@ class StatusController < ApplicationController
unless create_data
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 }
+ render :partial => "status_summary", :locals => { :status => nil, :error => error }
return false
end
status = ""
@@ -189,7 +190,7 @@ class StatusController < ApplicationController
end
end
- render :partial => "status_summary", :locals => { :status => status }
+ 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 1f376c2..070681c 100644
--- a/plugins/status/app/views/status/_status_summary.html.erb
+++ b/plugins/status/app/views/status/_status_summary.html.erb
@@ -1,7 +1,21 @@
+<% if !error.blank? %>
+<script type="text/javascript">
+$(document).ready(function() {
+ $('#details-link').click(function() { $('#details-link').hide();$('#details-text').show();return false; });
+});
+</script>
+<% end %>
+
<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 %>
<% else %>
<% link_to "status" do %>
<% if !status.blank? %>
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
