From 1e1a78a5815df7b490b589527e5069a29c24feee Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Tue, 9 Oct 2012 16:10:10 +0200
Subject: [PATCH] Fix the error message when widget can not be displayed

---
 .../WEB-INF/app/views/dashboard/_configure_widget.html.erb  | 4 ++--
 .../webapp/WEB-INF/app/views/dashboard/_widget.html.erb     | 4 ++--
 .../src/main/webapp/WEB-INF/app/views/widget/index.html.erb | 4 ++--
 sonar-server/src/main/webapp/WEB-INF/lib/resourceable.rb    | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_configure_widget.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_configure_widget.html.erb
index 6482380aef8..48be0d86172 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_configure_widget.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_configure_widget.html.erb
@@ -34,11 +34,11 @@
     <div class="block">
       <% if default_layout %>
       <div class="widget">   
-        <span class="empty_widget"><%= message('widget.error_occurred_please_read_logs', :params => widget.name) -%></span>
+        <span class="empty_widget"><%= message('widget.error_occurred_please_read_logs', :params => [widget.key]) -%></span>
         <div class="clear"></div>
       </div>
       <% else %>
-        <span class="empty_widget"><%= message('widget.error_occurred_please_read_logs', :params => widget.name) -%></span>
+        <span class="empty_widget"><%= message('widget.error_occurred_please_read_logs', :params => [widget.key]) -%></span>
       <% end %>
     </div>
   <% elsif widget_body.include? '<' %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget.html.erb
index c39863f4b6e..38b348df389 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget.html.erb
@@ -9,11 +9,11 @@
   <div class="block">
    <% if default_layout %>
      <div class="widget">   
-       <span class="empty_widget"><%= message('widget.error_occurred_please_read_logs', :params => widget.name) -%></span>
+       <span class="empty_widget"><%= message('widget.error_occurred_please_read_logs', :params => [widget.key]) -%></span>
        <div class="clear"></div>
      </div>
    <% else %>
-     <span class="empty_widget"><%= message('widget.error_occurred_please_read_logs', :params => widget.name) -%></span>
+     <span class="empty_widget"><%= message('widget.error_occurred_please_read_logs', :params => [widget.key]) -%></span>
    <% end %>
   </div>
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/widget/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/widget/index.html.erb
index 68f6685d349..93891cc2c0e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/widget/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/widget/index.html.erb
@@ -14,11 +14,11 @@
 
    <% if default_layout %>
      <div class="widget">   
-       <span class="empty_widget"><%= message('widget.error_occurred_please_read_logs', :params => @widget.key) -%></span>
+       <span class="empty_widget"><%= message('widget.error_occurred_please_read_logs', :params => [@widget.key]) -%></span>
        <div class="clear"></div>
      </div>
    <% else %>
-     <span class="empty_widget"><%= message('widget.error_occurred_please_read_logs', :params => @widget.key) -%></span>
+     <span class="empty_widget"><%= message('widget.error_occurred_please_read_logs', :params => [@widget.key]) -%></span>
    <% end %>
 
 <% 
diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/resourceable.rb b/sonar-server/src/main/webapp/WEB-INF/lib/resourceable.rb
index 7dab6542025..4d1da4014bd 100644
--- a/sonar-server/src/main/webapp/WEB-INF/lib/resourceable.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/lib/resourceable.rb
@@ -91,21 +91,21 @@ module Resourceable
   def leaves_qualifiers
     @leaves_qualifiers ||=
         begin
-          Java::OrgSonarServerUi::JRubyFacade.getInstance().getResourceLeavesQualifiers(qualifier)
+          Api::Utils.java_facade.getResourceLeavesQualifiers(qualifier)
         end
   end
 
   def children_qualifiers
     @children_qualifiers ||=
         begin
-          Java::OrgSonarServerUi::JRubyFacade.getInstance().getResourceChildrenQualifiers(qualifier)
+          Api::Utils.java_facade.getResourceChildrenQualifiers(qualifier)
         end
   end
 
   def java_resource_type
     @java_resource_type ||=
         begin
-          Java::OrgSonarServerUi::JRubyFacade.getInstance().getResourceType(qualifier)
+          Api::Utils.java_facade.getResourceType(qualifier)
         end
   end
 end
-- 
2.39.5