aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2012-10-09 22:52:45 +0200
committerSimon Brandhof <simon.brandhof@gmail.com>2012-10-09 22:52:45 +0200
commit3c665188f4717f971314684b752d953608081aaf (patch)
treefd48cc6c7ec26d389b9c76848554a7499dab6a8d /sonar-server
parentfeeba2c324912d9129cc6f357aeb7de7cb3c1502 (diff)
downloadsonarqube-3c665188f4717f971314684b752d953608081aaf.tar.gz
sonarqube-3c665188f4717f971314684b752d953608081aaf.zip
SONAR-3549 From the dependencies page, when selecting a library whose source code has been analysed, the bread crumb is unexpectedly updated
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb2
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb
index e125aaefe2d..fa0dc0a07a5 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb
@@ -40,7 +40,7 @@ class ApplicationController < ActionController::Base
end
def java_facade
- Java::OrgSonarServerUi::JRubyFacade.getInstance()
+ Api::Utils.java_facade
end
def available_locales
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
index b0b0dbf3012..19ba632075d 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
@@ -38,7 +38,7 @@
</div>
<div id="searchResourcesResults" class="autocomplete" style="display:none"></div>
</div>
-<%= render 'layouts/breadcrumb' -%>
+<%= render 'layouts/breadcrumb' if selected_section==Navigation::SECTION_RESOURCE-%>
<div id="body">
<div id="sb">
<div id="sidebar">