diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-01-06 11:31:52 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-01-06 11:32:02 +0100 |
| commit | 17486e3aecc47fbad31f189a9b68904bc18c59fb (patch) | |
| tree | dc9325e5fffb6ffb2853784c57a0f21b40642423 | |
| parent | dacd73d365b9e144ecf9259dd17e3a8dc9072fe3 (diff) | |
| download | sonarqube-17486e3aecc47fbad31f189a9b68904bc18c59fb.tar.gz sonarqube-17486e3aecc47fbad31f189a9b68904bc18c59fb.zip | |
SONAR-6016 End of support of Ruby source viewer extensions
4 files changed, 3 insertions, 83 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java index 61e8e691b94..8185c7828a1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java @@ -199,18 +199,6 @@ public final class JRubyFacade { return get(Views.class).getPages(section, resourceScope, resourceQualifier, resourceLanguage, (String[]) availableMeasures); } - public List<ViewProxy<Page>> getResourceTabs() { - return get(Views.class).getPages(NavigationSection.RESOURCE_TAB, null, null, null, null); - } - - public List<ViewProxy<Page>> getResourceTabs(String scope, String qualifier, String language, Object[] availableMeasures) { - return get(Views.class).getPages(NavigationSection.RESOURCE_TAB, scope, qualifier, language, (String[]) availableMeasures); - } - - public List<ViewProxy<Page>> getResourceTabsForMetric(String scope, String qualifier, String language, Object[] availableMeasures, String metric) { - return get(Views.class).getPagesForMetric(NavigationSection.RESOURCE_TAB, scope, qualifier, language, (String[]) availableMeasures, metric); - } - public ViewProxy<Page> getPage(String id) { return get(Views.class).getPage(id); } diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/drilldown_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/drilldown_controller.rb index 43574f0858f..4ffaac8abc3 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/drilldown_controller.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/drilldown_controller.rb @@ -172,15 +172,7 @@ class DrilldownController < ApplicationController end def display_metric_viewers?(resource, metric_key) - return true if resource.file? - java_facade.getResourceTabsForMetric(resource.scope, resource.qualifier, resource.language, resource.last_snapshot.metric_keys.to_java(:string), metric_key).each do |tab| - tab.getUserRoles().each do |role| - if has_role?(role, resource) - return true - end - end - end - false + return resource.file? end def display_violation_viewers?(snapshot) diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb index 7c9fbee8507..02014815da9 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb @@ -41,66 +41,4 @@ class ResourceController < ApplicationController redirect_to url_for(:controller => 'component', :action => 'index') + '#' + anchor end - # deprecated stuff for drilldown - def view - require_parameters 'id' - @resource = Project.by_key(params[:id]) - access_denied unless has_role?(:user, @resource) - @snapshot = @resource.last_snapshot - load_extensions() if @snapshot - if @extension - render :partial => 'view' - else - not_found('Extension not found') - end - end - - # - # Call by new component viewer to display plugin extension - # - # GET /resource/extension?id=<component_key>&tab=extension_key - def extension - @resource = Project.by_key(params[:id]) - not_found('Resource not found') unless @resource - @resource = @resource.permanent_resource - access_denied unless has_role?(:user, @resource) - - @snapshot = @resource.last_snapshot - load_extensions() if @snapshot - if @extension - render :partial => 'extension' - else - not_found('Extension not found') - end - end - - private - - def load_extensions - @extensions=[] - java_facade.getResourceTabs(@resource.scope, @resource.qualifier, @resource.language, @snapshot.metric_keys.to_java(:string)).each do |tab| - if tab.getUserRoles().empty? - @extensions<<tab - else - tab.getUserRoles().each do |role| - if has_role?(role, @resource) - @extensions<<tab - break - end - end - end - end - - if params[:tab].present? - # Hack to manage violations as issues. - params[:tab] = 'issues' if params[:tab] == 'violations' - @extension=@extensions.find { |extension| extension.getId()==params[:tab] } - - elsif !params[:metric].blank? - metric = Metric.by_key(params[:metric]) - @extension=@extensions.find { |extension| extension.getDefaultTabForMetrics().include?(metric.key) } - end - @extension=@extensions.find { |extension| extension.isDefaultTab() } if @extension==nil - end - end diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/NavigationSection.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/NavigationSection.java index 19b43b0bc40..3d5053b38f2 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/NavigationSection.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/NavigationSection.java @@ -37,11 +37,13 @@ public @interface NavigationSection { String RESOURCE = "resource"; /** + * Support removed in 5.1. See https://jira.codehaus.org/browse/SONAR-6016. * @deprecated in 4.5, as it costs too much to maintain and update. * @see <a href="https://jira.codehaus.org/browse/SONAR-5321">SONAR-5321</a> */ @Deprecated String RESOURCE_TAB = "resource_tab"; + String CONFIGURATION = "configuration"; /** |