jro_apps/redmine Commit - r124:95cc65f14e02

replaced deprecated controller instance variables: @params, @session, @request...

Jean-Philippe Lang -

r124:95cc65f14e02

parent child

Context file:

r124:95cc65f14e02

Collapse all files

app/controllers/admin_controller.rb +1 -1

             # 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 AdminController < ApplicationController
               layout 'base'
               before_filter :require_admin
               helper :sort
               include SortHelper
               def index
               end
               def projects
                 sort_init 'name', 'asc'
                 sort_update
                 @project_count = Project.count
                 @project_pages = Paginator.new self, @project_count,
 ,
-            								@params['page']
+            								params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
                 render :action => "projects", :layout => false if request.xhr?
               end
               def mail_options
                 @actions = Permission.find(:all, :conditions => ["mail_option=?", true]) || []
                 if request.post?
                   @actions.each { |a|
                     a.mail_enabled = (params[:action_ids] || []).include? a.id.to_s
                     a.save
                   }
                   flash.now[:notice] = l(:notice_successful_update)
                 end
               end
               def info
                 @adapter_name = ActiveRecord::Base.connection.adapter_name
               end
             end

app/controllers/application.rb +2 -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 ApplicationController < ActionController::Base
               before_filter :check_if_login_required, :set_localization
               def logged_in_user=(user)
                 @logged_in_user = user
                 session[:user_id] = (user ? user.id : nil)
               end
               def logged_in_user
                 if session[:user_id]
                   @logged_in_user ||= User.find(session[:user_id])
                 else
                   nil
                 end
               end
               # check if login is globally required to access the application
               def check_if_login_required
                 require_login if $RDM_LOGIN_REQUIRED
               end
               def set_localization
                 lang = begin
                   if self.logged_in_user and self.logged_in_user.language and !self.logged_in_user.language.empty? and GLoc.valid_languages.include? self.logged_in_user.language.to_sym
                     self.logged_in_user.language
                   elsif request.env['HTTP_ACCEPT_LANGUAGE']
                     accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.split('-').first
                     if accept_lang and !accept_lang.empty? and GLoc.valid_languages.include? accept_lang.to_sym
                       accept_lang
                     end
                   end
                 rescue
                   nil
                 end || $RDM_DEFAULT_LANG
                 set_language_if_valid(lang)
               end
               def require_login
                 unless self.logged_in_user
                   store_location
                   redirect_to :controller => "account", :action => "login"
                   return false
                 end
                 true
               end
               def require_admin
                 return unless require_login
                 unless self.logged_in_user.admin?
                   render :nothing => true, :status => 403
                   return false
                 end
                 true
               end
               # authorizes the user for the requested action.
-              def authorize(ctrl = @params[:controller], action = @params[:action])
+              def authorize(ctrl = params[:controller], action = params[:action])
                 # check if action is allowed on public projects
                 if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ ctrl, action ]
                   return true
                 end
                 # if action is not public, force login
                 return unless require_login
                 # admin is always authorized
                 return true if self.logged_in_user.admin?
                 # if not admin, check membership permission
                 @user_membership ||= Member.find(:first, :conditions => ["user_id=? and project_id=?", self.logged_in_user.id, @project.id])
                 if @user_membership and Permission.allowed_to_role( "%s/%s" % [ ctrl, action ], @user_membership.role_id )
                   return true
                 end
                 render :nothing => true, :status => 403
                 false
               end
               # store current uri in session.
               # return to this location by calling redirect_back_or_default
               def store_location
-                session[:return_to] = @request.request_uri
+                session[:return_to] = request.request_uri
               end
               # move to the last store_location call or to the passed default one
               def redirect_back_or_default(default)
                 if session[:return_to].nil?
                   redirect_to default
                 else
                   redirect_to_url session[:return_to]
                   session[:return_to] = nil
                 end
               end
               # qvalues http header parser
               # code taken from webrick
               def parse_qvalues(value)
                 tmp = []
                 if value
                   parts = value.split(/,\s*/)
                   parts.each {|part|
                     if m = %r{^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$}.match(part)
                       val = m[1]
                       q = (m[2] or 1).to_f
                       tmp.push([val, q])
                     end
                   }
                   tmp = tmp.sort_by{|val, q| -q}
                   tmp.collect!{|val, q| val}
                 end
                 return tmp
               end
             end

app/controllers/help_controller.rb +4 -4

             # 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 HelpController < ApplicationController
               skip_before_filter :check_if_login_required
               before_filter :load_help_config
               # displays help page for the requested controller/action
               def index
                 # select help page to display
-                if @params[:ctrl] and @help_config['pages'][@params[:ctrl]]
+                if params[:ctrl] and @help_config['pages'][params[:ctrl]]
-                  if @params[:page] and @help_config['pages'][@params[:ctrl]][@params[:page]]
+                  if params[:page] and @help_config['pages'][params[:ctrl]][params[:page]]
-                    template = @help_config['pages'][@params[:ctrl]][@params[:page]]
+                    template = @help_config['pages'][params[:ctrl]][params[:page]]
                   else
-                    template = @help_config['pages'][@params[:ctrl]]['index']
+                    template = @help_config['pages'][params[:ctrl]]['index']
                   end
                 end
                 # choose language according to available help translations
                 lang = (@help_config['langs'].include? current_language.to_s) ? current_language.to_s : @help_config['langs'].first
                 if template
                   redirect_to "/manual/#{lang}/#{template}"
                 else
                   redirect_to "/manual/#{lang}/"
                 end
               end
             private
               def load_help_config
                 @help_config = YAML::load(File.open("#{RAILS_ROOT}/config/help.yml"))
               end
             end

app/controllers/issues_controller.rb +2 -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 IssuesController < ApplicationController
               layout 'base', :except => :export_pdf
               before_filter :find_project, :authorize
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               def show
                 @status_options = @issue.status.workflows.find(:all, :include => :new_status, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
                 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
                 @journals_count = @issue.journals.count
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :limit => 15, :order => "journals.created_on desc")
               end
               def history
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "journals.created_on desc")
                 @journals_count = @journals.length
               end
               def export_pdf
                 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
                 @options_for_rfpdf ||= {}
                 @options_for_rfpdf[:file_name] = "#{@project.name}_#{@issue.long_id}.pdf"
               end
               def edit
                 @priorities = Enumeration::get_values('IPRI')
                 if request.get?
                   @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   begin
                     @issue.init_journal(self.logged_in_user)
                     # Retrieve custom fields and values
                     @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                     @issue.custom_values = @custom_values
                     @issue.attributes = params[:issue]
                     if @issue.save
                       flash[:notice] = l(:notice_successful_update)
                       redirect_to :action => 'show', :id => @issue
                     end
                   rescue ActiveRecord::StaleObjectError
                     # Optimistic locking exception
                     flash[:notice] = l(:notice_locking_conflict)
                   end
                 end
               end
               def add_note
                 unless params[:notes].empty?
                   journal = @issue.init_journal(self.logged_in_user, params[:notes])
                   #@history = @issue.histories.build(params[:history])
                   #@history.author_id = self.logged_in_user.id if self.logged_in_user
                   #@history.status = @issue.status
                   if @issue.save
                     flash[:notice] = l(:notice_successful_update)
-                    Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
+                    Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                     redirect_to :action => 'show', :id => @issue
                     return
                   end
                 end
                 show
                 render :action => 'show'
               end
               def change_status
                 #@history = @issue.histories.build(params[:history])
                 @status_options = @issue.status.workflows.find(:all, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
                 @new_status = IssueStatus.find(params[:new_status_id])
                 if params[:confirm]
                   begin
                     #@history.author_id = self.logged_in_user.id if self.logged_in_user
                     #@issue.status = @history.status
                     #@issue.fixed_version_id = (params[:issue][:fixed_version_id])
                     #@issue.assigned_to_id = (params[:issue][:assigned_to_id])
                     #@issue.done_ratio = (params[:issue][:done_ratio])
                     #@issue.lock_version = (params[:issue][:lock_version])
                     journal = @issue.init_journal(self.logged_in_user, params[:notes])
                     @issue.status = @new_status
                     if @issue.update_attributes(params[:issue])
                       flash[:notice] = l(:notice_successful_update)
-                      Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
+                      Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                       redirect_to :action => 'show', :id => @issue
                     end
                   rescue ActiveRecord::StaleObjectError
                     # Optimistic locking exception
                     flash[:notice] = l(:notice_locking_conflict)
                   end
                 end
                 @assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }
               end
               def destroy
                 @issue.destroy
                 redirect_to :controller => 'projects', :action => 'list_issues', :id => @project
               end
               def add_attachment
                 # Save the attachments
                 params[:attachments].each { |a|
                   @attachment = @issue.attachments.build(:file => a, :author => self.logged_in_user) unless a.size == 0
                   @attachment.save
                 } if params[:attachments] and params[:attachments].is_a? Array
                 redirect_to :action => 'show', :id => @issue
               end
               def destroy_attachment
                 @issue.attachments.find(params[:attachment_id]).destroy
                 redirect_to :action => 'show', :id => @issue
               end
               # Send the file in stream mode
               def download
                 @attachment = @issue.attachments.find(params[:attachment_id])
                 send_file @attachment.diskfile, :filename => @attachment.filename
               rescue
                 flash.now[:notice] = l(:notice_file_not_found)
                 render :text => "", :layout => true, :status => 404
               end
             private
               def find_project
                 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
                 @project = @issue.project
                 @html_title = "#{@project.name} - #{@issue.tracker.name} ##{@issue.id}"
               end
             end

app/controllers/my_controller.rb +1 -1

             # 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 MyController < ApplicationController
               layout 'base'
               before_filter :require_login
               BLOCKS = { 'issues_assigned_to_me' => :label_assigned_to_me_issues,
                          'issues_reported_by_me' => :label_reported_issues,
                          'latest_news' => :label_news_latest,
                          'calendar' => :label_calendar,
                          'documents' => :label_document_plural
                        }.freeze
               verify :xhr => true,
                      :session => :page_layout,
                      :only => [:add_block, :remove_block, :order_blocks]
               def index
                 page
                 render :action => 'page'
               end
               # Show user's page
               def page
                 @user = self.logged_in_user
                 @blocks = @user.pref[:my_page_layout] || { 'left' => ['issues_assigned_to_me'], 'right' => ['issues_reported_by_me'] }
               end
               # Edit user's account
               def account
                 @user = self.logged_in_user
                 @pref = @user.pref
                 @user.attributes = params[:user]
                 @user.pref.attributes = params[:pref]
                 if request.post? and @user.save
                   set_localization
                   flash.now[:notice] = l(:notice_account_updated)
                   self.logged_in_user.reload
                 end
               end
               # Change user's password
               def change_password
                 @user = self.logged_in_user
                 flash[:notice] = l(:notice_can_t_change_password) and redirect_to :action => 'account' and return if @user.auth_source_id
-                if @user.check_password?(@params[:password])
+                if @user.check_password?(params[:password])
                   @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
                   if @user.save
                     flash[:notice] = l(:notice_account_password_updated)
                   else
                     render :action => 'account'
                     return
                   end
                 else
                   flash[:notice] = l(:notice_account_wrong_password)
                 end
                 redirect_to :action => 'account'
               end
               # User's page layout configuration
               def page_layout
                 @user = self.logged_in_user
                 @blocks = @user.pref[:my_page_layout] || { 'left' => ['issues_assigned_to_me'], 'right' => ['issues_reported_by_me'] }
                 session[:page_layout] = @blocks
                 %w(top left right).each {|f| session[:page_layout][f] ||= [] }
                 @block_options = []
                 BLOCKS.each {|k, v| @block_options << [l(v), k]}
               end
               # Add a block to user's page
               # The block is added on top of the page
               # params[:block] : id of the block to add
               def add_block
                 @user = self.logged_in_user
                 block = params[:block]
                 # remove if already present in a group
                 %w(top left right).each {|f| (session[:page_layout][f] ||= []).delete block }
                 # add it on top
                 session[:page_layout]['top'].unshift block
                 render :partial => "block", :locals => {:user => @user, :block_name => block}
               end
               # Remove a block to user's page
               # params[:block] : id of the block to remove
               def remove_block
                 block = params[:block]
                 # remove block in all groups
                 %w(top left right).each {|f| (session[:page_layout][f] ||= []).delete block }
                 render :nothing => true
               end
               # Change blocks order on user's page
               # params[:group] : group to order (top, left or right)
               # params[:list-(top|left|right)] : array of block ids of the group
               def order_blocks
                 group = params[:group]
                 group_items = params["list-#{group}"]
                 if group_items and group_items.is_a? Array
                   # remove group blocks if they are presents in other groups
                   %w(top left right).each {|f|
                     session[:page_layout][f] = (session[:page_layout][f] || []) - group_items
                   }
                   session[:page_layout][group] = group_items
                 end
                 render :nothing => true
               end
               # Save user's page layout
               def page_layout_save
                 @user = self.logged_in_user
                 @user.pref[:my_page_layout] = session[:page_layout] if session[:page_layout]
                 @user.pref.save
                 session[:page_layout] = nil
                 redirect_to :action => 'page'
               end
             end

app/controllers/projects_controller.rb +5 -5

             # 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 ProjectsController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
               before_filter :require_admin, :only => [ :add, :destroy ]
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper IssuesHelper
               helper :queries
               include QueriesHelper
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               # Lists public projects
               def list
                 sort_init 'name', 'asc'
                 sort_update
                 @project_count = Project.count(["is_public=?", true])
                 @project_pages = Paginator.new self, @project_count,
 ,
-            								@params['page']
+            								params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:conditions => ["is_public=?", true],
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
                 render :action => "list", :layout => false if request.xhr?
               end
               # Add a new project
               def add
                 @custom_fields = IssueCustomField.find(:all)
                 @root_projects = Project.find(:all, :conditions => "parent_id is null")
                 @project = Project.new(params[:project])
                 if request.get?
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
                 else
-                  @project.custom_fields = CustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
+                  @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                   @project.custom_values = @custom_values
                   if params[:repository_enabled] && params[:repository_enabled] == "1"
                     @project.repository = Repository.new
                     @project.repository.attributes = params[:repository]
                   end
                   if @project.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
               end
               # Show @project
               def show
                 @custom_values = @project.custom_values.find(:all, :include => :custom_field)
                 @members = @project.members.find(:all, :include => [:user, :role])
                 @subprojects = @project.children if @project.children_count > 0
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")
                 @trackers = Tracker.find(:all)
               end
               def settings
                 @root_projects = Project::find(:all, :conditions => ["parent_id is null and id <> ?", @project.id])
                 @custom_fields = IssueCustomField.find(:all)
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @roles = Role.find(:all)
                 @users = User.find(:all) - @project.members.find(:all, :include => :user).collect{|m| m.user }
                 @custom_values ||= ProjectCustomField.find(:all).collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
               end
               # Edit @project
               def edit
                 if request.post?
-                  @project.custom_fields = IssueCustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
+                  @project.custom_fields = IssueCustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
                   if params[:custom_fields]
                     @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                     @project.custom_values = @custom_values
                   end
                   if params[:repository_enabled]
                     case params[:repository_enabled]
                     when "0"
                       @project.repository = nil
                     when "1"
                       @project.repository ||= Repository.new
                       @project.repository.attributes = params[:repository]
                     end
                   end
                   @project.attributes = params[:project]
                   if @project.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Delete @project
               def destroy
                 if request.post? and params[:confirm]
                   @project.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
               end
               # Add a new issue category to @project
               def add_issue_category
                 if request.post?
                   @issue_category = @project.issue_categories.build(params[:issue_category])
                   if @issue_category.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Add a new version to @project
               def add_version
               	@version = @project.versions.build(params[:version])
               	if request.post? and @version.save
               	  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'settings', :id => @project
               	end
               end
               # Add a new member to @project
               def add_member
                 @member = @project.members.build(params[:member])
               	if request.post?
                   if @member.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Show members list of @project
               def list_members
                 @members = @project.members
               end
               # Add a new document to @project
               def add_document
                 @categories = Enumeration::get_values('DCAT')
                 @document = @project.documents.build(params[:document])
                 if request.post?
                   # Save the attachment
                   if params[:attachment][:file].size > 0
                     @attachment = @document.attachments.build(params[:attachment])
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                   end
                   if @document.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list_documents', :id => @project
                   end
                 end
               end
               # Show documents list of @project
               def list_documents
                 @documents = @project.documents.find :all, :include => :category
               end
               # Add a new issue to @project
               def add_issue
                 @tracker = Tracker.find(params[:tracker_id])
                 @priorities = Enumeration::get_values('IPRI')
                 @issue = Issue.new(:project => @project, :tracker => @tracker)
                 if request.get?
                   @issue.start_date = Date.today
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   @issue.attributes = params[:issue]
                   @issue.author_id = self.logged_in_user.id if self.logged_in_user
                   # Multiple file upload
                   @attachments = []
                   params[:attachments].each { |a|
                     @attachments << Attachment.new(:container => @issue, :file => a, :author => logged_in_user) unless a.size == 0
                   } if params[:attachments] and params[:attachments].is_a? Array
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                   @issue.custom_values = @custom_values
                   if @issue.save
                     @attachments.each(&:save)
                     flash[:notice] = l(:notice_successful_create)
-                    Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
+                    Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                     redirect_to :action => 'list_issues', :id => @project
                   end
                 end
               end
               # Show filtered/sorted issues list of @project
               def list_issues
                 sort_init 'issues.id', 'desc'
                 sort_update
                 retrieve_query
                 @results_per_page_options = [ 15, 25, 50, 100 ]
                 if params[:per_page] and @results_per_page_options.include? params[:per_page].to_i
                   @results_per_page = params[:per_page].to_i
                   session[:results_per_page] = @results_per_page
                 else
                   @results_per_page = session[:results_per_page] || 25
                 end
                 if @query.valid?
                   @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
-                  @issue_pages = Paginator.new self, @issue_count, @results_per_page, @params['page']
+                  @issue_pages = Paginator.new self, @issue_count, @results_per_page, params['page']
                   @issues = Issue.find :all, :order => sort_clause,
               						:include => [ :author, :status, :tracker, :project ],
               						:conditions => @query.statement,
               						:limit  =>  @issue_pages.items_per_page,
               						:offset =>  @issue_pages.current.offset
                 end
                 render :layout => false if request.xhr?
               end
               # Export filtered/sorted issues list to CSV
               def export_issues_csv
                 sort_init 'issues.id', 'desc'
                 sort_update
                 retrieve_query
                 render :action => 'list_issues' and return unless @query.valid?
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project, :custom_values ],
             						:conditions => @query.statement
                 ic = Iconv.new('ISO-8859-1', 'UTF-8')
                 export = StringIO.new
                 CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
                   # csv header fields
                   headers = [ "#", l(:field_status), l(:field_tracker), l(:field_subject), l(:field_author), l(:field_created_on), l(:field_updated_on) ]
                   for custom_field in @project.all_custom_fields
                     headers << custom_field.name
                   end
                   csv << headers.collect {|c| ic.iconv(c) }
                   # csv lines
                   @issues.each do |issue|
                     fields = [issue.id, issue.status.name, issue.tracker.name, issue.subject, issue.author.display_name, l_datetime(issue.created_on),  l_datetime(issue.updated_on)]
                     for custom_field in @project.all_custom_fields
                       fields << (show_value issue.custom_value_for(custom_field))
                     end
                     csv << fields.collect {|c| ic.iconv(c.to_s) }
                   end
                 end
                 export.rewind
                 send_data(export.read, :type => 'text/csv; header=present', :filename => 'export.csv')
               end
               # Export filtered/sorted issues to PDF
               def export_issues_pdf
                 sort_init 'issues.id', 'desc'
                 sort_update
                 retrieve_query
                 render :action => 'list_issues' and return unless @query.valid?
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project, :custom_values ],
             						:conditions => @query.statement
                 @options_for_rfpdf ||= {}
                 @options_for_rfpdf[:file_name] = "export.pdf"
                 render :layout => false
               end
               def move_issues
                 @issues = @project.issues.find(params[:issue_ids]) if params[:issue_ids]
                 redirect_to :action => 'list_issues', :id => @project and return unless @issues
                 @projects = []
                 # find projects to which the user is allowed to move the issue
                 @logged_in_user.memberships.each {|m| @projects << m.project if Permission.allowed_to_role("projects/move_issues", m.role_id)}
                 # issue can be moved to any tracker
                 @trackers = Tracker.find(:all)
                 if request.post? and params[:new_project_id] and params[:new_tracker_id]
                   new_project = Project.find(params[:new_project_id])
                   new_tracker = Tracker.find(params[:new_tracker_id])
                   @issues.each { |i|
                     # project dependent properties
                     unless i.project_id == new_project.id
                       i.category = nil
                       i.fixed_version = nil
                     end
                     # move the issue
                     i.project = new_project
                     i.tracker = new_tracker
                     i.save
                   }
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list_issues', :id => @project
                 end
               end
               def add_query
                 @query = Query.new(params[:query])
                 @query.project = @project
                 @query.user = logged_in_user
                 params[:fields].each do |field|
                   @query.add_filter(field, params[:operators][field], params[:values][field])
                 end if params[:fields]
                 if request.post? and @query.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :controller => 'reports', :action => 'issue_report', :id => @project
                 end
                 render :layout => false if request.xhr?
               end
               # Add a news to @project
               def add_news
                 @news = News.new(:project => @project)
                 if request.post?
                   @news.attributes = params[:news]
                   @news.author_id = self.logged_in_user.id if self.logged_in_user
                   if @news.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list_news', :id => @project
                   end
                 end
               end
               # Show news list of @project
               def list_news
                 @news_pages, @news = paginate :news, :per_page => 10, :conditions => ["project_id=?", @project.id], :include => :author, :order => "news.created_on DESC"
                 render :action => "list_news", :layout => false if request.xhr?
               end
               def add_file
                 @attachment = Attachment.new(params[:attachment])
                 if request.post? and params[:attachment][:file].size > 0
                   @attachment.container = @project.versions.find_by_id(params[:version_id])
                   @attachment.author = logged_in_user
                   if @attachment.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                   end
                 end
                 @versions = @project.versions
               end
               def list_files
                 @versions = @project.versions
               end
               # Show changelog for @project
               def changelog
                 @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true])
                 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 ||= []
                 @fixed_issues = @project.issues.find(:all,
                   :include => [ :fixed_version, :status, :tracker ],
                   :conditions => [ "issue_statuses.is_closed=? and issues.tracker_id in (#{@selected_tracker_ids.join(',')}) and issues.fixed_version_id is not null", true],
                   :order => "versions.effective_date DESC, issues.id DESC"
                 ) unless @selected_tracker_ids.empty?
                 @fixed_issues ||= []
               end
               def activity
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 @date_from = Date.civil(@year, @month, 1)
                 @date_to = (@date_from >> 1)-1
                 @events_by_day = {}
                 unless params[:show_issues] == "0"
                   @project.issues.find(:all, :include => [:author, :status], :conditions => ["issues.created_on>=? and issues.created_on<=?", @date_from, @date_to] ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_issues = 1
                 end
                 unless params[:show_news] == "0"
                   @project.news.find(:all, :conditions => ["news.created_on>=? and news.created_on<=?", @date_from, @date_to], :include => :author ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_news = 1
                 end
                 unless params[:show_files] == "0"
                   Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN versions ON versions.id = attachments.container_id", :conditions => ["attachments.container_type='Version' and versions.project_id=? and attachments.created_on>=? and attachments.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_files = 1
                 end
                 unless params[:show_documents] == "0"
                   @project.documents.find(:all, :conditions => ["documents.created_on>=? and documents.created_on<=?", @date_from, @date_to] ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN documents ON documents.id = attachments.container_id", :conditions => ["attachments.container_type='Document' and documents.project_id=? and attachments.created_on>=? and attachments.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_documents = 1
                 end
                 render :layout => false if request.xhr?
               end
               def calendar
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 @date_from = Date.civil(@year, @month, 1)
                 @date_to = (@date_from >> 1)-1
                 # start on monday
                 @date_from = @date_from - (@date_from.cwday-1)
                 # finish on sunday
                 @date_to = @date_to + (7-@date_to.cwday)
                 @issues = @project.issues.find(:all, :include => :tracker, :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", @date_from, @date_to, @date_from, @date_to])
                 render :layout => false if request.xhr?
               end
               def gantt
                 if params[:year] and params[:year].to_i >0
                   @year_from = params[:year].to_i
                   if params[:month] and params[:month].to_i >=1 and params[:month].to_i <= 12
                     @month_from = params[:month].to_i
                   else
                     @month_from = 1
                   end
                 else
                   @month_from ||= (Date.today << 1).month
                   @year_from ||= (Date.today << 1).year
                 end
                 @zoom = (params[:zoom].to_i > 0 and params[:zoom].to_i < 5) ? params[:zoom].to_i : 2
                 @months = (params[:months].to_i > 0 and params[:months].to_i < 25) ? params[:months].to_i : 6
                 @date_from = Date.civil(@year_from, @month_from, 1)
                 @date_to = (@date_from >> @months) - 1
                 @issues = @project.issues.find(:all, :order => "start_date, due_date", :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null)", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to])
                 if params[:output]=='pdf'
                   @options_for_rfpdf ||= {}
                   @options_for_rfpdf[:file_name] = "gantt.pdf"
                   render :template => "projects/gantt.rfpdf", :layout => false
                 else
                   render :template => "projects/gantt.rhtml"
                 end
               end
             private
               # Find project of id params[:id]
               # if not found, redirect to project list
               # Used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
                 @html_title = @project.name
               rescue
                 redirect_to :action => 'list'
               end
               # Retrieve query from session or build a new query
               def retrieve_query
                 if params[:query_id]
                   @query = @project.queries.find(params[:query_id])
                 else
                   if params[:set_filter] or !session[:query] or session[:query].project_id != @project.id
                     # Give it a name, required to be valid
                     @query = Query.new(:name => "_")
                     @query.project = @project
                     if params[:fields] and params[:fields].is_a? Array
                       params[:fields].each do |field|
                         @query.add_filter(field, params[:operators][field], params[:values][field])
                       end
                     else
                       @query.available_filters.keys.each do |field|
                         @query.add_short_filter(field, params[field]) if params[field]
                       end
                     end
                     session[:query] = @query
                   else
                     @query = session[:query]
                   end
                 end
               end
             end

app/controllers/roles_controller.rb +2 -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 RolesController < ApplicationController
             	layout 'base'
             	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]
+                  @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] || [])
+                  @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/users_controller.rb +1 -1

             # 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 UsersController < ApplicationController
               layout 'base'
               before_filter :require_admin
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               def list
                 sort_init 'login', 'asc'
                 sort_update
                 @user_count = User.count
                 @user_pages = Paginator.new self, @user_count,
 ,
-            								@params['page']
+            								params['page']
                 @users =  User.find :all,:order => sort_clause,
             						:limit  =>  @user_pages.items_per_page,
             						:offset =>  @user_pages.current.offset
                 render :action => "list", :layout => false if request.xhr?
               end
               def add
                 if request.get?
                   @user = User.new(:language => $RDM_DEFAULT_LANG)
                   @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
                 else
                   @user = User.new(params[:user])
                   @user.admin = params[:user][:admin] || false
                   @user.login = params[:user][:login]
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
                   @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
                   @user.custom_values = @custom_values
                   if @user.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list'
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
               end
               def edit
                 @user = User.find(params[:id])
                 if request.get?
                   @custom_values = UserCustomField.find(:all).collect { |x| @user.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
                 else
                   @user.admin = params[:user][:admin] if params[:user][:admin]
                   @user.login = params[:user][:login] if params[:user][:login]
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id
                   if params[:custom_fields]
                     @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
                     @user.custom_values = @custom_values
                   end
                   if @user.update_attributes(params[:user])
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'list'
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
                 @roles = Role.find :all
                 @projects = Project.find(:all) - @user.projects
                 @membership ||= Member.new
               end
               def edit_membership
                 @user = User.find(params[:id])
                 @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:user => @user)
                 @membership.attributes = params[:membership]
                 if request.post? and @membership.save
                   flash[:notice] = l(:notice_successful_update)
                 end
                 redirect_to :action => 'edit', :id => @user and return
               end
               def destroy_membership
                 @user = User.find(params[:id])
                 if request.post? and Member.find(params[:membership_id]).destroy
                   flash[:notice] = l(:notice_successful_update)
                 end
                 redirect_to :action => 'edit', :id => @user and return
               end
               def destroy
                 User.find(params[:id]).destroy
                 redirect_to :action => 'list'
               rescue
                 flash[:notice] = "Unable to delete user"
                 redirect_to :action => 'list'
               end
             end

app/helpers/application_helper.rb +4 -4

             # 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.
             module ApplicationHelper
               # Return current logged in user or nil
               def loggedin?
                 @logged_in_user
               end
               # Return true if user is logged in and is admin, otherwise false
               def admin_loggedin?
                 @logged_in_user and @logged_in_user.admin?
               end
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 # check if action is allowed on public projects
                 if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ controller, action ]
                   return true
                 end
                 # check if user is authorized
                 if @logged_in_user and (@logged_in_user.admin? or Permission.allowed_to_role( "%s/%s" % [ controller, action ], @logged_in_user.role_for_project(@project.id)  )  )
                   return true
                 end
                 return false
               end
               # Display a link if user is authorized
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller], options[:action])
               end
               # Display a link to user's account page
               def link_to_user(user)
                 link_to user.display_name, :controller => 'account', :action => 'show', :id => user
               end
               def format_date(date)
                 l_date(date) if date
               end
               def format_time(time)
                 l_datetime(time) if time
               end
               def day_name(day)
                 l(:general_day_names).split(',')[day-1]
               end
               def month_name(month)
                 l(:actionview_datehelper_select_month_names).split(',')[month-1]
               end
               def pagination_links_full(paginator, options={}, html_options={})
                 html = ''
                 html << link_to_remote(('&#171; ' + l(:label_previous)),
                                         {:update => "content", :url => { :page => paginator.current.previous }},
-                                        {:href => url_for(:action => 'list', :params => @params.merge({:page => paginator.current.previous}))}) + ' ' if paginator.current.previous
+                                        {:href => url_for(:action => 'list', :params => params.merge({:page => paginator.current.previous}))}) + ' ' if paginator.current.previous
                 html << (pagination_links_each(paginator, options) do |n|
                   link_to_remote(n.to_s,
-                                  {:url => {:action => 'list', :params => @params.merge({:page => n})}, :update => 'content'},
+                                  {:url => {:action => 'list', :params => params.merge({:page => n})}, :update => 'content'},
-                                  {:href => url_for(:action => 'list', :params => @params.merge({:page => n}))})
+                                  {:href => url_for(:action => 'list', :params => params.merge({:page => n}))})
                 end || '')
                 html << ' ' + link_to_remote((l(:label_next) + ' &#187;'),
                                              {:update => "content", :url => { :page => paginator.current.next }},
-                                             {:href => url_for(:action => 'list', :params => @params.merge({:page => paginator.current.next}))}) if paginator.current.next
+                                             {:href => url_for(:action => 'list', :params => params.merge({:page => paginator.current.next}))}) if paginator.current.next
                 html
               end
               def textilizable(text)
                 $RDM_TEXTILE_DISABLED ? simple_format(auto_link(h(text))) : RedCloth.new(h(text)).to_html
               end
               def error_messages_for(object_name, options = {})
                 options = options.symbolize_keys
                 object = instance_variable_get("@#{object_name}")
                 if object && !object.errors.empty?
                   # build full_messages here with controller current language
                   full_messages = []
                   object.errors.each do |attr, msg|
                     next if msg.nil?
                     if attr == "base"
                       full_messages << l(msg)
                     else
                       full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
                     end
                   end
                   # retrieve custom values error messages
                   if object.errors[:custom_values]
                     object.custom_values.each do |v|
                       v.errors.each do |attr, msg|
                         next if msg.nil?
                         full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
                       end
                     end
                   end
                   content_tag("div",
                     content_tag(
                       options[:header_tag] || "h2", lwr(:gui_validation_error, full_messages.length) + " :"
                     ) +
                     content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
                     "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
                   )
                 else
                   ""
                 end
               end
               def lang_options_for_select
                 (GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }).collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]}
               end
               def label_tag_for(name, option_tags = nil, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 content_tag("label", label_text)
               end
               def labelled_tabular_form_for(name, object, options, &proc)
                 options[:html] ||= {}
                 options[:html].store :class, "tabular"
                 form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
               end
               def check_all_links(form_name)
                 link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                 " | " +
                 link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
               end
               def calendar_for(field_id)
                 image_tag("calendar", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
                 javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
               end
             end
             class TabularFormBuilder < ActionView::Helpers::FormBuilder
               include GLoc
               def initialize(object_name, object, template, options, proc)
                 set_language_if_valid options.delete(:lang)
                 @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc
               end
               (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|
                 src = <<-END_SRC
                 def #{selector}(field, options = {})
                   return super if options.delete :no_label
                   label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                   label = @template.content_tag("label", label_text,
                                 :class => (@object && @object.errors[field] ? "error" : nil),
                                 :for => (@object_name.to_s + "_" + field.to_s))
                   label + super
                 end
                 END_SRC
                 class_eval src, __FILE__, __LINE__
               end
               def select(field, choices, options = {}, html_options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 label = @template.content_tag("label", label_text,
                               :class => (@object && @object.errors[field] ? "error" : nil),
                               :for => (@object_name.to_s + "_" + field.to_s))
                 label + super
               end
             end

app/helpers/sort_helper.rb +8 -8

             # Helpers to sort tables using clickable column headers.
             #
             # Author:  Stuart Rackham <srackham@methods.co.nz>, March 2005.
             # License: This source code is released under the MIT license.
             #
             # - Consecutive clicks toggle the column's sort order.
             # - Sort state is maintained by a session hash entry.
             # - Icon image identifies sort column and state.
             # - Typically used in conjunction with the Pagination module.
             #
             # Example code snippets:
             #
             # Controller:
             #
             #   helper :sort
             #   include SortHelper
             #
             #   def list
             #     sort_init 'last_name'
             #     sort_update
             #     @items = Contact.find_all nil, sort_clause
             #   end
             #
             # Controller (using Pagination module):
             #
             #   helper :sort
             #   include SortHelper
             #
             #   def list
             #     sort_init 'last_name'
             #     sort_update
             #     @contact_pages, @items = paginate :contacts,
             #       :order_by => sort_clause,
             #       :per_page => 10
             #   end
             #
             # View (table header in list.rhtml):
             #
             #   <thead>
             #     <tr>
             #       <%= sort_header_tag('id', :title => 'Sort by contact ID') %>
             #       <%= sort_header_tag('last_name', :caption => 'Name') %>
             #       <%= sort_header_tag('phone') %>
             #       <%= sort_header_tag('address', :width => 200) %>
             #     </tr>
             #   </thead>
             #
             # - The ascending and descending sort icon images are sort_asc.png and
             #   sort_desc.png and reside in the application's images directory.
             # - Introduces instance variables: @sort_name, @sort_default.
             # - Introduces params :sort_key and :sort_order.
             #
             module SortHelper
               # Initializes the default sort column (default_key) and sort order
               # (default_order).
               #
               # - default_key is a column attribute name.
               # - default_order is 'asc' or 'desc'.
               # - name is the name of the session hash entry that stores the sort state,
               #   defaults to '<controller_name>_sort'.
               #
               def sort_init(default_key, default_order='asc', name=nil)
-                @sort_name = name || @params[:controller] + @params[:action] + '_sort'
+                @sort_name = name || params[:controller] + params[:action] + '_sort'
                 @sort_default = {:key => default_key, :order => default_order}
               end
               # Updates the sort state. Call this in the controller prior to calling
               # sort_clause.
               #
               def sort_update()
-                if @params[:sort_key]
+                if params[:sort_key]
-                  sort = {:key => @params[:sort_key], :order => @params[:sort_order]}
+                  sort = {:key => params[:sort_key], :order => params[:sort_order]}
-                elsif @session[@sort_name]
+                elsif session[@sort_name]
-                  sort = @session[@sort_name]   # Previous sort.
+                  sort = session[@sort_name]   # Previous sort.
                 else
                   sort = @sort_default
                 end
-                @session[@sort_name] = sort
+                session[@sort_name] = sort
               end
               # Returns an SQL sort clause corresponding to the current sort state.
               # Use this to sort the controller's table items collection.
               #
               def sort_clause()
-                @session[@sort_name][:key] + ' ' + @session[@sort_name][:order]
+                session[@sort_name][:key] + ' ' + session[@sort_name][:order]
               end
               # Returns a link which sorts by the named column.
               #
               # - column is the name of an attribute in the sorted record collection.
               # - The optional caption explicitly specifies the displayed link text.
               # - A sort icon image is positioned to the right of the sort link.
               #
               def sort_link(column, caption=nil)
-                key, order = @session[@sort_name][:key], @session[@sort_name][:order]
+                key, order = session[@sort_name][:key], session[@sort_name][:order]
                 if key == column
                   if order.downcase == 'asc'
                     icon = 'sort_asc'
                     order = 'desc'
                   else
                     icon = 'sort_desc'
                     order = 'asc'
                   end
                 else
                   icon = nil
                   order = 'desc' # changed for desc order by default
                 end
                 caption = titleize(Inflector::humanize(column)) unless caption
                 params = {:params => {:sort_key => column, :sort_order => order}}
                 link_to_remote(caption,
                               {:update => "content", :url => { :sort_key => column, :sort_order => order}},
                               {:href => url_for(:params => { :sort_key => column, :sort_order => order})}) +
                 (icon ? nbsp(2) + image_tag(icon) : '')
               end
               # Returns a table header <th> tag with a sort link for the named column
               # attribute.
               #
               # Options:
               #   :caption     The displayed link name (defaults to titleized column name).
               #   :title       The tag's 'title' attribute (defaults to 'Sort by :caption').
               #
               # Other options hash entries generate additional table header tag attributes.
               #
               # Example:
               #
               #   <%= sort_header_tag('id', :title => 'Sort by contact ID', :width => 40) %>
               #
               # Renders:
               #
               #   <th title="Sort by contact ID" width="40">
               #     <a href="/contact/list?sort_order=desc&amp;sort_key=id">Id</a>
               #     &nbsp;&nbsp;<img alt="Sort_asc" src="/images/sort_asc.png" />
               #   </th>
               #
               def sort_header_tag(column, options = {})
                 if options[:caption]
                   caption = options[:caption]
                   options.delete(:caption)
                 else
                   caption = titleize(Inflector::humanize(column))
                 end
                 options[:title]= "Sort by #{caption}" unless options[:title]
                 content_tag('th', sort_link(column, caption), options)
               end
               private
                 # Return n non-breaking spaces.
                 def nbsp(n)
                   '&nbsp;' * n
                 end
                 # Return capitalized title.
                 def titleize(title)
                   title.split.map {|w| w.capitalize }.join(' ')
                 end
             end

app/views/enumerations/list.rhtml +1 -1

             <h2><%=l(:label_enumerations)%></h2>
             <% Enumeration::OPTIONS.each do |option, name| %>
-            	<% if @params[:opt]==option %>
+            	<% if params[:opt]==option %>
             		<p><%= image_tag 'dir_open' %> <b><%= l(name) %></b></p>
             		<ul>
             		<% for value in Enumeration.find(:all, :conditions => ["opt = ?", option]) %>
             			<li><%= link_to value.name, :action => 'edit', :id => value %></li>
             		<% end %>
                 </ul>
                 <ul>
                   <li><%= link_to ('&#187; ' + l(:label_new)), :action => 'new', :opt => option %></li>
                 </ul>
             	<% else %>
             		<p><%= image_tag 'dir' %> <%= link_to l(name), :opt => option %></p>
             	<% end %>
             <% end %>

app/views/layouts/base.rhtml +1 -1

             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
             <head>
             <title><%= $RDM_HEADER_TITLE + (@html_title ? ": #{@html_title}" : "") %></title>
             <meta http-equiv="content-type" content="text/html; charset=utf-8" />
             <meta name="description" content="redMine" />
             <meta name="keywords" content="issue,bug,tracker" />
             <%= stylesheet_link_tag "application" %>
             <%= stylesheet_link_tag "print", :media => "print" %>
             <%= javascript_include_tag :defaults %>
             <%= javascript_include_tag 'menu' %>
             <%= javascript_include_tag 'calendar/calendar' %>
             <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
             <%= javascript_include_tag 'calendar/calendar-setup' %>
             <%= stylesheet_link_tag 'calendar' %>
             <%= stylesheet_link_tag 'jstoolbar' %>
             <!-- page specific tags -->
             <%= yield :header_tags %>
             </head>
             <body>
             <div id="container" >
                 <div id="header">
                 <div style="float: left;">
                     <h1><%= $RDM_HEADER_TITLE %></h1>
                     <h2><%= $RDM_HEADER_SUBTITLE %></h2>
                 </div>
                 <div style="float: right; padding-right: 1em; padding-top: 0.2em;">
                   <% if loggedin? %><small><%=l(:label_logged_as)%> <b><%= @logged_in_user.login %></b></small><% end %>
                 </div>
                 </div>
             	<div id="navigation">
             		<ul>
             	<li class="selected"><%= link_to l(:label_home), { :controller => '' }, :class => "picHome" %></li>
             	<li><%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => "picUserPage" %></li>
             	<li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "picProject" %></li>
                 <% unless @project.nil? || @project.id.nil? %>
                     <li class="submenu"><%= link_to @project.name, { :controller => 'projects', :action => 'show', :id => @project }, :class => "picProject", :onmouseover => "buttonMouseover(event, 'menuProject');"  %></li>
                 <% end %>
                 <% if loggedin? %>
             		<li><%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => "picUser" %></li>
                 <% end %>
             	<% if admin_loggedin? %>
             		<li class="submenu"><%= link_to l(:label_administration), { :controller => 'admin' }, :class => "picAdmin", :onmouseover => "buttonMouseover(event, 'menuAdmin');" %></li>
             	<% end %>
-            	<li class="right"><%= link_to l(:label_help), { :controller => 'help', :ctrl => @params[:controller], :page => @params[:action] }, :target => "new", :class => "picHelp" %></li>
+            	<li class="right"><%= link_to l(:label_help), { :controller => 'help', :ctrl => params[:controller], :page => params[:action] }, :target => "new", :class => "picHelp" %></li>
             	<% if loggedin? %>
             		<li class="right"><%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => "picUser" %></li>
             	<% else %>
             		<li class="right"><%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => "picUser" %></li>
             	<% end %>
             		</ul>
             	</div>
                 <% if admin_loggedin? %>
                 <div id="menuAdmin" class="menu" onmouseover="menuMouseover(event)">
                     <a class="menuItem" href="/admin/projects" onmouseover="menuItemMouseover(event,'menuProjects');"><span class="menuItemText"><%=l(:label_project_plural)%></span><span class="menuItemArrow">&#9654;</span></a>
                     <a class="menuItem" href="/users" onmouseover="menuItemMouseover(event,'menuUsers');"><span class="menuItemText"><%=l(:label_user_plural)%></span><span class="menuItemArrow">&#9654;</span></a>
                     <a class="menuItem" href="/roles"><%=l(:label_role_and_permissions)%></a>
                     <a class="menuItem" href="/trackers" onmouseover="menuItemMouseover(event,'menuTrackers');"><span class="menuItemText"><%=l(:label_tracker_plural)%></span><span class="menuItemArrow">&#9654;</span></a>
                     <a class="menuItem" href="/custom_fields"><%=l(:label_custom_field_plural)%></a>
                     <a class="menuItem" href="/enumerations"><%=l(:label_enumerations)%></a>
                     <a class="menuItem" href="/admin/mail_options"><%=l(:field_mail_notification)%></a>
                     <a class="menuItem" href="/auth_sources"><%=l(:label_authentication)%></a>
                     <a class="menuItem" href="/admin/info"><%=l(:label_information_plural)%></a>
                 </div>
                 <div id="menuTrackers" class="menu">
                     <a class="menuItem" href="/issue_statuses"><%=l(:label_issue_status_plural)%></a>
                     <a class="menuItem" href="/roles/workflow"><%=l(:label_workflow)%></a>
                 </div>
                 <div id="menuProjects" class="menu"><a class="menuItem" href="/projects/add"><%=l(:label_new)%></a></div>
                 <div id="menuUsers" class="menu"><a class="menuItem" href="/users/add"><%=l(:label_new)%></a></div>
                 <% end %>
                 <% unless @project.nil? || @project.id.nil? %>
                 <div id="menuProject" class="menu" onmouseover="menuMouseover(event)">
                     <%= link_to l(:label_calendar), {:controller => 'projects', :action => 'calendar', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_gantt), {:controller => 'projects', :action => 'gantt', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_issue_plural), {:controller => 'projects', :action => 'list_issues', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_report_plural), {:controller => 'reports', :action => 'issue_report', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_activity), {:controller => 'projects', :action => 'activity', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_news_plural), {:controller => 'projects', :action => 'list_news', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_change_log), {:controller => 'projects', :action => 'changelog', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_member_plural), {:controller => 'projects', :action => 'list_members', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_attachment_plural), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_repository), {:controller => 'repositories', :action => 'show', :id => @project}, :class => "menuItem" if @project.repository and !@project.repository.new_record? %>
                     <%= link_to_if_authorized l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project }, :class => "menuItem" %>
                 </div>
                 <% end %>
             	<div id="subcontent">
             		<% unless @project.nil? || @project.id.nil? %>
             			<h2><%= @project.name %></h2>
             			<ul class="menublock">
             				<li><%= link_to l(:label_overview), :controller => 'projects', :action => 'show', :id => @project %></li>
             				<li><%= link_to l(:label_calendar), :controller => 'projects', :action => 'calendar', :id => @project %></li>
             				<li><%= link_to l(:label_gantt), :controller => 'projects', :action => 'gantt', :id => @project %></li>
             				<li><%= link_to l(:label_issue_plural), :controller => 'projects', :action => 'list_issues', :id => @project %></li>
             				<li><%= link_to l(:label_report_plural), :controller => 'reports', :action => 'issue_report', :id => @project %></li>
             				<li><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :id => @project %></li>
             				<li><%= link_to l(:label_news_plural), :controller => 'projects', :action => 'list_news', :id => @project %></li>
             				<li><%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %></li>
             				<li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li>
             				<li><%= link_to l(:label_member_plural), :controller => 'projects', :action => 'list_members', :id => @project %></li>
             				<li><%= link_to l(:label_attachment_plural), :controller => 'projects', :action => 'list_files', :id => @project %></li>
             				<li><%= link_to l(:label_repository), :controller => 'repositories', :action => 'show', :id => @project if @project.repository and !@project.repository.new_record? %></li>
             				<li><%= link_to_if_authorized l(:label_settings), :controller => 'projects', :action => 'settings', :id => @project %></li>
             			</ul>
             		<% end %>
             		<% if loggedin? and @logged_in_user.memberships.length > 0 %>
             			<h2><%=l(:label_my_projects) %></h2>
             			<ul class="menublock">
             				<% for membership in @logged_in_user.memberships %>
             					<li><%= link_to membership.project.name, :controller => 'projects', :action => 'show', :id => membership.project %></li>
             				<% end %>
             			</ul>
             		<% end %>
             	</div>
             	<div id="content">
             		<% if flash[:notice] %><p style="color: green"><%= flash[:notice] %></p><% end %>
             		<%= @content_for_layout %>
             	</div>
             	<div id="footer">
             		<p>
             		<%= auto_link $RDM_FOOTER_SIG %> |
             		<a href="http://redmine.rubyforge.org/" target="_new"><%= RDM_APP_NAME %></a> <%= RDM_APP_VERSION %>
             		</p>
             	</div>
             </div>
             </body>
             </html>

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