Mailinglist Archive: yast-commit (1224 mails)

[Stefan Schubert <schubi@xxxxxxx>]

ref: refs/heads/backgroud_patches_bnc550934
commit 4b6271f67667fc18d50caaec7c8028322d51d569
Author: Stefan Schubert <schubi@xxxxxxx>
Date:   Wed Nov 18 13:26:44 2009 +0100

    no flash in an AJAX response; (bnc#555311)
---
 .../status/app/controllers/status_controller.rb    |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/status/app/controllers/status_controller.rb 
b/plugins/status/app/controllers/status_controller.rb
index 5921a8f..4936a53 100644
--- a/plugins/status/app/controllers/status_controller.rb
+++ b/plugins/status/app/controllers/status_controller.rb
@@ -118,9 +118,7 @@ class StatusController < ApplicationController
       end
       break if found
     end
-    flash[:notice] = _("No data found for showing system status.") unless found
-
-    true
+    found
   end
 
 
@@ -134,7 +132,7 @@ class StatusController < ApplicationController
 
   def edit
     return unless client_permissions
-    create_data
+    flash[:notice] = _("No data found for showing system status.") unless 
create_data
   end
 
   def ajax_log_custom
@@ -159,8 +157,7 @@ class StatusController < ApplicationController
 
     log = YaST::ServiceResource.proxy_for('org.opensuse.yast.system.logs')
     @logs = log.find(:all) 
-    
-    create_data
+    flash[:notice] = _("No data found for showing system status.") unless 
create_data
     limits_reached
     logger.debug "limits reached for #{@limits_list[:reached].inspect}"
   end
@@ -169,9 +166,12 @@ class StatusController < ApplicationController
   def show_summary
     return unless client_permissions
     begin
-      create_data
-      status = limits_reached
-      status = (_("Limits exceeded for %s") % status) unless status.empty?
+      if create_data
+        status = limits_reached
+        status = (_("Limits exceeded for %s") % status) unless status.empty?
+      else
+        status = _("No data found for showing system status.")
+      end
       render :partial => "status_summary", :locals => { :status => status, 
:error => nil }
     rescue Exception => error
       erase_redirect_results #reset all redirects
-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx