From 94f7781e022d744ea072de397ea7596fba00bb20 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Fri, 23 Aug 2013 14:13:39 +0200 Subject: [PATCH] SONAR-4584 Stop providing a RSS feed at project level --- .../plugins/core/widgets/description.html.erb | 6 -- .../app/controllers/feeds_controller.rb | 60 ------------------- .../WEB-INF/app/views/layouts/_head.html.erb | 10 ---- 3 files changed, 76 deletions(-) delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/controllers/feeds_controller.rb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/description.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/description.html.erb index 8709ef58907..4e9f75e6a99 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/description.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/description.html.erb @@ -24,12 +24,6 @@ <%= link_to profile_measure.data, {:controller => '/rules_configuration', :action => 'index', :id => profile_measure.value.to_i}, :id => 'profile_link' -%> (<%= message('widget.description.profile_version_x', :params => format_measure('profile_version', :default => '1')) -%>) <% end %> - <% if Project::SCOPE_SET==@project.scope %> - - <%= message('widget.description.alerts') -%>: - <%= image_tag 'rss-12x12.png' -%> <%= message('widget.description.alerts_rss_feed') -%> - - <% end %> <% unless @project.project_links.empty? %> <%= message('widget.description.links') -%>: diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/feeds_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/feeds_controller.rb deleted file mode 100644 index 7f8d8b67015..00000000000 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/feeds_controller.rb +++ /dev/null @@ -1,60 +0,0 @@ -# -# SonarQube, open source software quality management tool. -# Copyright (C) 2008-2013 SonarSource -# mailto:contact AT sonarsource DOT com -# -# SonarQube is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 3 of the License, or (at your option) any later version. -# -# SonarQube is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -class FeedsController < ApplicationController - - FEEDS_LIMIT = 30 - MAX_FEEDS_LIMIT = 100 - - def projects - @category=params[:id] - if @category - @events = Event.find(:all, :include => 'resource', :conditions => ['category=?', @category], :limit => feeds_count_limit, :order => "event_date desc") - else - @events = Event.find(:all, :include => 'resource', :limit => feeds_count_limit, :order => "event_date desc") - end - - @events=@events.select{|evt| evt.resource} - - @date=(@events.empty? ? Time.now : @events.first.event_date) - respond_to do |format| - format.atom - end - end - - def project - @project=Project.by_key(params[:id]) - access_denied unless is_user?(@project) - - @category=params[:category] - conditions={:resource_id => @project.id} - conditions[:category]=@category if @category - @events = Event.find(:all, :include => 'resource', :conditions => conditions, :limit => feeds_count_limit, :order => "event_date desc") - @date=(@events.empty? ? Time.now : @events.first.event_date) - respond_to do |format| - format.atom - end - end - - private - def feeds_count_limit - limit = params[:limit] - limit.nil? ? FEEDS_LIMIT : [limit.to_i, MAX_FEEDS_LIMIT].max - end -end diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb index 32a5f7bae82..bdacff27a4d 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb @@ -6,16 +6,6 @@ <% - if @project - %> - - <% - else - %> - - <% - end - if @page_title title="SonarQube - #{h(@page_title)}" elsif @project -- 2.39.5