diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2012-10-09 16:10:10 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2012-10-09 16:10:48 +0200 |
| commit | 1e1a78a5815df7b490b589527e5069a29c24feee (patch) | |
| tree | 9c34f01864a9117523dc2ca7b6c0dcc21d065631 | |
| parent | bdb511d4b6fc6cf7ab956101fff419174cdb3cc6 (diff) | |
| download | sonarqube-1e1a78a5815df7b490b589527e5069a29c24feee.tar.gz sonarqube-1e1a78a5815df7b490b589527e5069a29c24feee.zip | |
Fix the error message when widget can not be displayed
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 |