jro_apps/redmine Commit - r198:99c560295fca

indentation corrections...

Jean-Philippe Lang -

r198:99c560295fca

parent child

Context file:

r198:99c560295fca

Collapse all files

app/controllers/issue_categories_controller.rb +3 -3

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # 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.
             class IssueCategoriesController < ApplicationController
-            	layout 'base'
+              layout 'base'
-            	before_filter :find_project, :authorize
+              before_filter :find_project, :authorize
               def edit
                 if request.post? and @category.update_attributes(params[:category])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
                 end
               end
               def destroy
                 @category.destroy
                 redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
               rescue
                 flash[:notice] = "Categorie can't be deleted"
                 redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
               end
             private
               def find_project
                 @category = IssueCategory.find(params[:id])
                 @project = @category.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/issue_statuses_controller.rb +4 -6

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # 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.
             class IssueStatusesController < ApplicationController
-            	layout 'base'
+              layout 'base'
-            	before_filter :require_admin
+              before_filter :require_admin
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               def list
                 @issue_status_pages, @issue_statuses = paginate :issue_statuses, :per_page => 10
                 render :action => "list", :layout => false if request.xhr?
               end
               def new
                 @issue_status = IssueStatus.new
               end
               def create
                 @issue_status = IssueStatus.new(params[:issue_status])
                 if @issue_status.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 else
                   render :action => 'new'
                 end
               end
               def edit
                 @issue_status = IssueStatus.find(params[:id])
               end
               def update
                 @issue_status = IssueStatus.find(params[:id])
                 if @issue_status.update_attributes(params[:issue_status])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 else
                   render :action => 'edit'
                 end
               end
               def destroy
                 IssueStatus.find(params[:id]).destroy
                 redirect_to :action => 'list'
               rescue
                 flash[:notice] = "Unable to delete issue status"
                 redirect_to :action => 'list'
               end
             end

app/controllers/members_controller.rb +1 -2

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # 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.
             class MembersController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize
               def edit
                 if request.post? and @member.update_attributes(params[:member])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project
                 end
               end
               def destroy
                 @member.destroy
                 flash[:notice] = l(:notice_successful_delete)
                 redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project
               end
             private
               def find_project
                 @member = Member.find(params[:id])
                 @project = @member.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/news_controller.rb +6 -6

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # 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.
             class NewsController < ApplicationController
-            	layout 'base'
+              layout 'base'
-            	before_filter :find_project, :authorize
+              before_filter :find_project, :authorize
               def show
               end
               def edit
                 if request.post? and @news.update_attributes(params[:news])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @news
                 end
               end
               def add_comment
                 @comment = Comment.new(params[:comment])
                 @comment.author = logged_in_user
                 if @news.comments << @comment
                   flash[:notice] = l(:label_comment_added)
                   redirect_to :action => 'show', :id => @news
                 else
                   render :action => 'show'
                 end
               end
               def destroy_comment
                 @news.comments.find(params[:comment_id]).destroy
                 redirect_to :action => 'show', :id => @news
               end
-            	def destroy
+              def destroy
-            		@news.destroy
+                @news.destroy
-            		redirect_to :controller => 'projects', :action => 'list_news', :id => @project
+                redirect_to :controller => 'projects', :action => 'list_news', :id => @project
-            	end
+              end
             private
               def find_project
                 @news = News.find(params[:id])
                 @project = @news.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/reports_controller.rb +12 -12

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # 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.
             class ReportsController < ApplicationController
-             	layout 'base'
+              layout 'base'
-            	before_filter :find_project, :authorize
+              before_filter :find_project, :authorize
               def issue_report
                 @statuses = IssueStatus.find :all
                 case params[:detail]
                 when "tracker"
                   @field = "tracker_id"
                   @rows = Tracker.find :all
                   @data = issues_by_tracker
                   @report_title = l(:field_tracker)
                   render :template => "reports/issue_report_details"
                 when "priority"
                   @field = "priority_id"
                   @rows = Enumeration::get_values('IPRI')
                   @data = issues_by_priority
                   @report_title = l(:field_priority)
                   render :template => "reports/issue_report_details"
                 when "category"
                   @field = "category_id"
                   @rows = @project.issue_categories
                   @data = issues_by_category
                   @report_title = l(:field_category)
                   render :template => "reports/issue_report_details"
                 when "author"
                   @field = "author_id"
                   @rows = @project.members.collect { |m| m.user }
                   @data = issues_by_author
                   @report_title = l(:field_author)
                   render :template => "reports/issue_report_details"
                 else
                   @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]
                   @trackers = Tracker.find(:all)
                   @priorities = Enumeration::get_values('IPRI')
                   @categories = @project.issue_categories
                   @authors = @project.members.collect { |m| m.user }
                   issues_by_tracker
                   issues_by_priority
                   issues_by_category
                   issues_by_author
                   render :template => "reports/issue_report"
                 end
               end
               def delays
                 @trackers = Tracker.find(:all)
                 if request.get?
                   @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }
                 else
                   @selected_tracker_ids = params[:tracker_ids].collect { |id| id.to_i.to_s } if params[:tracker_ids] and params[:tracker_ids].is_a? Array
                 end
                 @selected_tracker_ids ||= []
                 @raw =
                   ActiveRecord::Base.connection.select_all("SELECT datediff( a.created_on, b.created_on ) as delay, count(a.id) as total
                   FROM issue_histories a, issue_histories b, issues i
                   WHERE a.status_id =5
                   AND a.issue_id = b.issue_id
                   AND a.issue_id = i.id
                   AND i.tracker_id in (#{@selected_tracker_ids.join(',')})
                   AND b.id = (
                   SELECT min( c.id )
                   FROM issue_histories c
                   WHERE b.issue_id = c.issue_id )
                   GROUP BY delay") unless @selected_tracker_ids.empty?
                 @raw ||=[]
                 @x_from = 0
                 @x_to = 0
                 @y_from = 0
                 @y_to = 0
                 @sum_total = 0
                 @sum_delay = 0
                 @raw.each do |r|
                   @x_to = [r['delay'].to_i, @x_to].max
                   @y_to = [r['total'].to_i, @y_to].max
                   @sum_total = @sum_total + r['total'].to_i
                   @sum_delay = @sum_delay + r['total'].to_i * r['delay'].to_i
                 end
               end
             private
               # Find project of id params[:id]
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
-            	def issues_by_tracker
+              def issues_by_tracker
                 @issues_by_tracker ||=
                     ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               t.id as tracker_id,
                                                               count(i.id) as total
                                                             from
                                                               issues i, issue_statuses s, trackers t
                                                             where
                                                               i.status_id=s.id
                                                               and i.tracker_id=t.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, t.id")
-            	end
+              end
-            	def issues_by_priority
+              def issues_by_priority
                 @issues_by_priority ||=
                   ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               p.id as priority_id,
                                                               count(i.id) as total
                                                             from
                                                               issues i, issue_statuses s, enumerations p
                                                             where
                                                               i.status_id=s.id
                                                               and i.priority_id=p.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, p.id")
-            	end
+              end
-            	def issues_by_category
+              def issues_by_category
                 @issues_by_category ||=
                   ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               c.id as category_id,
                                                               count(i.id) as total
                                                             from
                                                               issues i, issue_statuses s, issue_categories c
                                                             where
                                                               i.status_id=s.id
                                                               and i.category_id=c.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, c.id")
-            	end
+              end
-            	def issues_by_author
+              def issues_by_author
                 @issues_by_author ||=
                   ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               a.id as author_id,
                                                               count(i.id) as total
                                                             from
                                                               issues i, issue_statuses s, users a
                                                             where
                                                               i.status_id=s.id
                                                               and i.author_id=a.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, a.id")
-            	end
+              end
             end

app/controllers/roles_controller.rb +3 -3

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # 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.
             class RolesController < ApplicationController
-            	layout 'base'
+              layout 'base'
-            	before_filter :require_admin
+              before_filter :require_admin
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               def list
                 @role_pages, @roles = paginate :roles, :per_page => 10
                 render :action => "list", :layout => false if request.xhr?
               end
               def new
                 @role = Role.new(params[:role])
                 if request.post?
                   @role.permissions = Permission.find(params[:permission_ids]) if params[:permission_ids]
                   if @role.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list'
                   end
                 end
                 @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
               end
               def edit
                 @role = Role.find(params[:id])
                 if request.post? and @role.update_attributes(params[:role])
                   @role.permissions = Permission.find(params[:permission_ids] || [])
                   Permission.allowed_to_role_expired
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
                 @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
               end
               def destroy
                 @role = Role.find(params[:id])
                 unless @role.members.empty?
                   flash[:notice] = 'Some members have this role. Can\'t delete it.'
                 else
                   @role.destroy
                 end
                 redirect_to :action => 'list'
               end
               def workflow
                 @role = Role.find_by_id(params[:role_id])
                 @tracker = Tracker.find_by_id(params[:tracker_id])
                 if request.post?
                   Workflow.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
                   (params[:issue_status] || []).each { |old, news|
                     news.each { |new|
                       @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => old, :new_status_id => new)
                     }
                   }
                   if @role.save
                     flash[:notice] = l(:notice_successful_update)
                   end
                 end
                 @roles = Role.find :all
                 @trackers = Tracker.find :all
                 @statuses = IssueStatus.find(:all, :include => :workflows)
               end
             end

app/controllers/trackers_controller.rb +1 -2

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # 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.
             class TrackersController < ApplicationController
               layout 'base'
               before_filter :require_admin
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
               verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :list }
               def list
                 @tracker_pages, @trackers = paginate :trackers, :per_page => 10
                 render :action => "list", :layout => false if request.xhr?
               end
               def new
                 @tracker = Tracker.new(params[:tracker])
                 if request.post? and @tracker.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 end
               end
               def edit
                 @tracker = Tracker.find(params[:id])
                 if request.post? and @tracker.update_attributes(params[:tracker])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
               end
               def destroy
                 @tracker = Tracker.find(params[:id])
                 unless @tracker.issues.empty?
                   flash[:notice] = "This tracker contains issues and can\'t be deleted."
                 else
                   @tracker.destroy
                 end
                 redirect_to :action => 'list'
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages