From 08653afa2dd26cb5c3ca2663caffdcba3917a8d8 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Wed, 31 Aug 2011 12:02:48 +0000 Subject: [PATCH] remove trailing white-spaces from app/controllers/projects_controller.rb. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6893 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/projects_controller.rb | 46 +++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index c8f26a96c..c765556e9 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -5,12 +5,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program 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 General Public License for more details. -# +# # You should have received a copy of the GNU 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. @@ -19,7 +19,7 @@ class ProjectsController < ApplicationController menu_item :overview menu_item :roadmap, :only => :roadmap menu_item :settings, :only => :settings - + before_filter :find_project, :except => [ :index, :list, :new, :create, :copy ] before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy] before_filter :authorize_global, :only => [:new, :create] @@ -36,19 +36,19 @@ class ProjectsController < ApplicationController helper :sort include SortHelper helper :custom_fields - include CustomFieldsHelper + include CustomFieldsHelper helper :issues helper :queries include QueriesHelper helper :repositories include RepositoriesHelper include ProjectsHelper - + # Lists visible projects def index respond_to do |format| - format.html { - @projects = Project.visible.find(:all, :order => 'lft') + format.html { + @projects = Project.visible.find(:all, :order => 'lft') } format.api { @offset, @limit = api_offset_and_limit @@ -62,7 +62,7 @@ class ProjectsController < ApplicationController } end end - + def new @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position") @trackers = Tracker.all @@ -85,7 +85,7 @@ class ProjectsController < ApplicationController @project.members << m end respond_to do |format| - format.html { + format.html { flash[:notice] = l(:notice_successful_create) redirect_to(params[:continue] ? {:controller => 'projects', :action => 'new', :project => {:parent_id => @project.parent_id}.reject {|k,v| v.nil?}} : @@ -100,9 +100,9 @@ class ProjectsController < ApplicationController format.api { render_validation_errors(@project) } end end - + end - + def copy @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position") @trackers = Tracker.all @@ -116,7 +116,7 @@ class ProjectsController < ApplicationController @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers? else redirect_to :controller => 'admin', :action => 'projects' - end + end else Mailer.with_deliveries(params[:notifications] == '1') do @project = Project.new @@ -144,27 +144,27 @@ class ProjectsController < ApplicationController # try to redirect to the requested menu item redirect_to_project_menu_item(@project, params[:jump]) && return end - + @users_by_role = @project.users_by_role @subprojects = @project.children.visible.all @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC") @trackers = @project.rolled_up_trackers - + cond = @project.project_condition(Setting.display_subprojects_issues?) - + @open_issues_by_tracker = Issue.visible.count(:group => :tracker, :include => [:project, :status, :tracker], :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false]) @total_issues_by_tracker = Issue.visible.count(:group => :tracker, :include => [:project, :status, :tracker], :conditions => cond) - + if User.current.allowed_to?(:view_time_entries, @project) @total_hours = TimeEntry.visible.sum(:hours, :include => :project, :conditions => cond).to_f end - + @key = User.current.rss_key - + respond_to do |format| format.html format.api @@ -179,7 +179,7 @@ class ProjectsController < ApplicationController @repository ||= @project.repository @wiki ||= @project.wiki end - + def edit end @@ -190,7 +190,7 @@ class ProjectsController < ApplicationController if validate_parent_id && @project.save @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') respond_to do |format| - format.html { + format.html { flash[:notice] = l(:notice_successful_update) redirect_to :action => 'settings', :id => @project } @@ -198,7 +198,7 @@ class ProjectsController < ApplicationController end else respond_to do |format| - format.html { + format.html { settings render :action => 'settings' } @@ -222,12 +222,12 @@ class ProjectsController < ApplicationController end redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status])) end - + def unarchive @project.unarchive if request.post? && !@project.active? redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status])) end - + # Delete @project def destroy @project_to_destroy = @project