jro_apps/redmine Commit - r428:cf4651b6bb38

Added link_to_issue helper....

Jean-Philippe Lang -

r428:cf4651b6bb38

parent child

Context file:

r428:cf4651b6bb38

Collapse all files

app/controllers/projects_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require 'csv'
             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 "#{Project.table_name}.name", "asc"
                 sort_update
                 @project_count = Project.count(:all, :conditions => ["is_public=?", true])
                 @project_pages = Paginator.new self, @project_count,
 ,
             								params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:conditions => ["#{Project.table_name}.is_public=?", true],
             						:include => :parent,
             						: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]
                   @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 "1" == params[:wiki_enabled]
                     @project.wiki = Wiki.new
                     @project.wiki.attributes = params[:wiki]
                   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], :order => 'position')
                 @subprojects = @project.children if @project.children.size > 0
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = Tracker.find(:all, :order => 'position')
                 @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{Issue.table_name}.status_id", :conditions => ["project_id=? and #{IssueStatus.table_name}.is_closed=?", @project.id, false])
                 @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])
               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, :order => 'position')
                 @users = User.find_active(:all) - @project.users
                 @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]
                   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.update_attributes params[:repository]
                     end
                   end
                   if params[:wiki_enabled]
                     case params[:wiki_enabled]
                     when "0"
                       @project.wiki.destroy if @project.wiki
                     when "1"
                       @project.wiki ||= Wiki.new
                       @project.wiki.update_attributes params[:wiki]
                     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', :tab => 'categories', :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', :tab => 'versions', :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', :tab => 'members', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Show members list of @project
               def list_members
                 @members = @project.members.find(:all)
               end
               # Add a new document to @project
               def add_document
                 @categories = Enumeration::get_values('DCAT')
                 @document = @project.documents.build(params[:document])
                 if request.post? and @document.save
                   # Save the attachments
                   params[:attachments].each { |a|
                     Attachment.create(:container => @document, :file => a, :author => logged_in_user) unless a.size == 0
                   } if params[:attachments] and params[:attachments].is_a? Array
                   flash[:notice] = l(:notice_successful_create)
                   Mailer.deliver_document_add(@document) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                   redirect_to :action => 'list_documents', :id => @project
                 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')
                 default_status = IssueStatus.default
                 @issue = Issue.new(:project => @project, :tracker => @tracker)
                 @issue.status = default_status
                 @allowed_statuses = default_status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
                 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]
                   requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
                   @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
                   @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?
                     redirect_to :action => 'list_issues', :id => @project
                   end
                 end
               end
               # Show filtered/sorted issues list of @project
               def list_issues
                 sort_init "#{Issue.table_name}.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']
                   @issues = Issue.find :all, :order => sort_clause,
               						:include => [ :assigned_to, :status, :tracker, :project, :priority ],
               						:conditions => @query.statement,
               						:limit  =>  @issue_pages.items_per_page,
               						:offset =>  @issue_pages.current.offset
                 end
                 @trackers = Tracker.find :all, :order => 'position'
                 render :layout => false if request.xhr?
               end
               # Export filtered/sorted issues list to CSV
               def export_issues_csv
                 sort_init "#{Issue.table_name}.id", "desc"
                 sort_update
                 retrieve_query
                 render :action => 'list_issues' and return unless @query.valid?
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :assigned_to, :author, :status, :tracker, :priority, {:custom_values => :custom_field} ],
             						:conditions => @query.statement,
             						:limit => Setting.issues_export_limit
                 ic = Iconv.new(l(:general_csv_encoding), '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_priority),
                                    l(:field_subject),
                                    l(:field_assigned_to),
                                    l(:field_author),
                                    l(:field_start_date),
                                    l(:field_due_date),
                                    l(:field_done_ratio),
                                    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.priority.name,
                                         issue.subject,
                                         (issue.assigned_to ? issue.assigned_to.name : ""),
                                         issue.author.name,
                                         issue.start_date ? l_date(issue.start_date) : nil,
                                         issue.due_date ? l_date(issue.due_date) : nil,
                                         issue.done_ratio,
                                         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 "#{Issue.table_name}.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, :priority ],
             						:conditions => @query.statement,
             						:limit => Setting.issues_export_limit
                 @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)}
                 # 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.table_name}.created_on DESC"
                 render :action => "list_news", :layout => false if request.xhr?
               end
               def add_file
                 if request.post?
                   @version = @project.versions.find_by_id(params[:version_id])
                   # Save the attachments
                   @attachments = []
                   params[:attachments].each { |file|
                     next unless file.size > 0
                     a = Attachment.create(:container => @version, :file => file, :author => logged_in_user)
                     @attachments << a unless a.new_record?
                   } if params[:attachments] and params[:attachments].is_a? Array
                   Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                 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], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 @fixed_issues = @project.issues.find(:all,
                   :include => [ :fixed_version, :status, :tracker ],
                   :conditions => [ "#{IssueStatus.table_name}.is_closed=? and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}) and #{Issue.table_name}.fixed_version_id is not null", true],
                   :order => "#{Version.table_name}.effective_date DESC, #{Issue.table_name}.id DESC"
                 ) unless @selected_tracker_ids.empty?
                 @fixed_issues ||= []
               end
               def roadmap
                 @trackers = Tracker.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.find(:all,
                   :conditions => [ "#{Version.table_name}.effective_date>?", Date.today],
                   :order => "#{Version.table_name}.effective_date ASC"
                 )
               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 => ["#{Issue.table_name}.created_on>=? and #{Issue.table_name}.created_on<=?", @date_from, @date_to] ).each { |i|
+                  @project.issues.find(:all, :include => [:author], :conditions => ["#{Issue.table_name}.created_on>=? and #{Issue.table_name}.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.table_name}.created_on>=? and #{News.table_name}.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 => "#{Attachment.table_name}.*", :joins => "LEFT JOIN #{Version.table_name} ON #{Version.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Version' and #{Version.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.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 => ["#{Document.table_name}.created_on>=? and #{Document.table_name}.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 #{Document.table_name} ON #{Document.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Document' and #{Document.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.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
                 unless params[:show_wiki_edits] == "0"
                   select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comment, " +
                            "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title"
                   joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +
                           "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id "
                   conditions = ["#{Wiki.table_name}.project_id = ? AND #{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?",
                                 @project.id, @date_from, @date_to]
                   WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => conditions).each { |i|
                     # We provide this alias so all events can be treated in the same manner
                     def i.created_on
                       self.updated_on
                     end
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_wiki_edits = 1
                 end
                 unless @project.repository.nil? || params[:show_changesets] == "0"
                   @project.repository.changesets.find(:all, :conditions => ["#{Changeset.table_name}.committed_on BETWEEN ? AND ?", @date_from, @date_to]).each { |i|
                     def i.created_on
                       self.committed_on
                     end
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_changesets = 1
                 end
                 render :layout => false if request.xhr?
               end
               def calendar
                 @trackers = Tracker.find(:all, :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 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)
                 @events = []
                 @project.issues_with_subprojects(params[:with_subprojects]) do
                   @events += Issue.find(:all,
                                        :include => [:tracker, :status, :assigned_to, :priority],
                                        :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)) and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", @date_from, @date_to, @date_from, @date_to]
                                        ) unless @selected_tracker_ids.empty?
                 end
                 @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
                 @ending_events_by_days = @events.group_by {|event| event.due_date}
                 @starting_events_by_days = @events.group_by {|event| event.start_date}
                 render :layout => false if request.xhr?
               end
               def gantt
                 @trackers = Tracker.find(:all, :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 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
                 @events = []
                 @project.issues_with_subprojects(params[:with_subprojects]) do
                   @events += Issue.find(:all,
                                        :order => "start_date, due_date",
                                        :include => [:tracker, :status, :assigned_to, :priority],
                                        :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 and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
                                        ) unless @selected_tracker_ids.empty?
                 end
                 @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
                 @events.sort! {|x,y| x.start_date <=> y.start_date }
                 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
               def search
                 @question = params[:q] || ""
                 @question.strip!
                 @all_words = params[:all_words] || (params[:submit] ? false : true)
                 @scope = params[:scope] || (params[:submit] ? [] : %w(issues changesets news documents wiki) )
                 # tokens must be at least 3 character long
                 @tokens = @question.split.uniq.select {|w| w.length > 2 }
                 if !@tokens.empty?
                   # no more than 5 tokens to search for
                   @tokens.slice! 5..-1 if @tokens.size > 5
                   # strings used in sql like statement
                   like_tokens = @tokens.collect {|w| "%#{w}%"}
                   operator = @all_words ? " AND " : " OR "
                   limit = 10
                   @results = []
                   @results += @project.issues.find(:all, :limit => limit, :include => :author, :conditions => [ (["(LOWER(subject) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'issues'
                   @results += @project.news.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort], :include => :author ) if @scope.include? 'news'
                   @results += @project.documents.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'documents'
                   @results += @project.wiki.pages.find(:all, :limit => limit, :include => :content, :conditions => [ (["(LOWER(title) like ? OR LOWER(text) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @project.wiki && @scope.include?('wiki')
                   @results += @project.repository.changesets.find(:all, :limit => limit, :conditions => [ (["(LOWER(comment) like ?)"] * like_tokens.size).join(operator), * (like_tokens).sort] ) if @project.repository && @scope.include?('changesets')
                   @question = @tokens.join(" ")
                 else
                   @question = ""
                 end
               end
               def feeds
                 @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]
                 @key = logged_in_user.get_or_create_rss_key.value if logged_in_user
               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 ActiveRecord::RecordNotFound
                 render_404
               end
               def retrieve_selected_tracker_ids(selectable_trackers)
                 if ids = params[:tracker_ids]
                   @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
                 else
                   @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
                 end
               end
               # Retrieve query from session or build a new query
               def retrieve_query
                 if params[:query_id]
                   @query = @project.queries.find(params[:query_id])
                   session[:query] = @query
                 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/helpers/application_helper.rb +4 0

             # redMine - project management software
             # Copyright (C) 2006-2007  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)  )  )
                   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 link_to_issue(issue)
+                link_to "#{issue.tracker.name} ##{issue.id}", :controller => "issues", :action => "show", :id => issue
+              end
               def image_to_function(name, function, html_options = {})
                 html_options.symbolize_keys!
                 tag(:input, html_options.merge({
                     :type => "image", :src => image_path(name),
                     :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};"
                     }))
               end
               def format_date(date)
                 l_date(date) if date
               end
               def format_time(time)
                 l_datetime((time.is_a? String) ? time.to_time : 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 => options.merge(:page => paginator.current.previous)},
                                         {:href => url_for(:params => options.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 => options.merge(:page => n)}, :update => 'content'},
                                   {:href => url_for(:params => options.merge(:page => n))})
                 end || '')
                 html << ' ' + link_to_remote((l(:label_next) + ' &#187;'),
                                              {:update => "content", :url => options.merge(:page => paginator.current.next)},
                                              {:href => url_for(:params => options.merge(:page => paginator.current.next))}) if paginator.current.next
                 html
               end
               # textilize text according to system settings and RedCloth availability
               def textilizable(text, options = {})
                 # different methods for formatting wiki links
                 case options[:wiki_links]
                 when :local
                   # used for local links to html files
                   format_wiki_link = Proc.new {|title| "#{title}.html" }
                 when :anchor
                   # used for single-file wiki export
                   format_wiki_link = Proc.new {|title| "##{title}" }
                 else
                   if @project
                     format_wiki_link = Proc.new {|title| url_for :controller => 'wiki', :action => 'index', :id => @project, :page => title }
                   else
                     format_wiki_link = Proc.new {|title| title }
                   end
                 end
                 # turn wiki links into textile links:
                 # example:
                 #   [[link]] -> "link":link
                 #   [[link|title]] -> "title":link
                 text = text.gsub(/\[\[([^\]\|]+)(\|([^\]\|]+))?\]\]/) {|m| "\"#{$3 || $1}\":" + format_wiki_link.call(Wiki.titleize($1)) }
                 # turn issue ids to textile links
                 # example:
                 #   #52 -> "#52":/issues/show/52
                 text = text.gsub(/#(\d+)(?=\b)/) {|m| "\"##{$1}\":" + url_for(:controller => 'issues', :action => 'show', :id => $1) }
                 # turn revision ids to textile links (@project needed)
                 # example:
                 #   r52 -> "r52":/repositories/revision/6?rev=52 (@project.id is 6)
                 text = text.gsub(/r(\d+)(?=\b)/) {|m| "\"r#{$1}\":" + url_for(:controller => 'repositories', :action => 'revision', :id => @project.id, :rev => $1) } if @project
                 # finally textilize text
                 @do_textilize ||= (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize")
                 text = @do_textilize ? auto_link(RedCloth.new(text).to_html) : simple_format(auto_link(h(text)))
               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?
                     msg = msg.first if msg.is_a? Array
                     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?
                         msg = msg.first if msg.is_a? Array
                         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(blank=true)
                 (blank ? [["(auto)", ""]] : []) +
                   (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.png", {: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/views/issues/_tooltip.rhtml +1 -1

-            <%= link_to "#{issue.tracker.name} ##{issue.id}", { :controller => 'issues', :action => 'show', :id => issue } %></strong>: <%=h issue.subject %><br />
+            <%= link_to_issue issue %></strong>: <%=h issue.subject %><br />
             <br />
             <strong><%= l(:field_start_date) %></strong>: <%= format_date(issue.start_date) %><br />
             <strong><%= l(:field_due_date) %></strong>: <%= format_date(issue.due_date) %><br />
             <strong><%= l(:field_assigned_to) %></strong>: <%= issue.assigned_to ? issue.assigned_to.name : "-" %><br />
             <strong><%= l(:field_priority) %></strong>: <%= issue.priority.name %>

app/views/my/blocks/_calendar.rhtml +1 -1

             <h3><%= l(:label_calendar) %></h3>
             <%
             @date_from = Date.today - (Date.today.cwday-1)
             @date_to = Date.today + (7-Date.today.cwday)
             @issues = Issue.find :all,
                                  :conditions => ["#{Issue.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')}) AND ((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", @date_from, @date_to, @date_from, @date_to],
                                  :include => [:project, :tracker]  unless @user.projects.empty?
             @issues ||= []
             %>
             <table class="list with-cells">
             <thead><tr>
             <th></th>
             <% 1.upto(7) do |d| %>
                 <th align="center" width="14%"><%= day_name(d) %></th>
             <% end %>
             </tr></thead>
             <tbdoy>
             <tr height="100">
             <% day = @date_from
             while day <= @date_to
             	if day.cwday == 1 %>
             	<th valign="middle"><%= day.cweek %></th>
             	<% end %>
             	<td valign="top" width="14%" class="<%= day.month==@month ? "even" : "odd" %>">
             	<p align="right"><%= day==Date.today ? "<b>#{day.day}</b>" : day.day %></p>
             	<% day_issues = []
             	@issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day }
             	day_issues.each do |i| %>
             		<%= if day == i.start_date and day == i.due_date
             		    image_tag('arrow_bw.png')
             		elsif day == i.start_date
             		    image_tag('arrow_from.png')
             		elsif day == i.due_date
             		    image_tag('arrow_to.png')
             		end %>
-            		<small><%= link_to "#{i.tracker.name} ##{i.id}", :controller => 'issues', :action => 'show', :id => i %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small><br />
+            		<small><%= link_to_issue i %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small><br />
             	<% end %>
                 </td>
             	<%= '</tr><tr height="100">' if day.cwday >= 7 and day!=@date_to %>
             	<%
             	day = day + 1
             end %>
             </tr>
             </tbody>
             </table>

app/views/projects/activity.rhtml +1 -1

             <h2><%=l(:label_activity)%>: <%= "#{month_name(@month).downcase} #{@year}" %></h2>
             <div>
             <div class="rightbox">
             <% form_tag do %>
             <p><%= select_month(@month, :prefix => "month", :discard_type => true) %>
             <%= select_year(@year, :prefix => "year", :discard_type => true) %></p>
             <p>
                 <%= check_box_tag 'show_issues', 1, @show_issues %><%= hidden_field_tag 'show_issues', 0, :id => nil %> <%=l(:label_issue_plural)%><br />
                 <% if @project.repository %><%= check_box_tag 'show_changesets', 1, @show_changesets %><%= hidden_field_tag 'show_changesets', 0, :id => nil %> <%=l(:label_revision_plural)%><br /><% end %>
                 <%= check_box_tag 'show_news', 1, @show_news %><%= hidden_field_tag 'show_news', 0, :id => nil %> <%=l(:label_news_plural)%><br />
                 <%= check_box_tag 'show_files', 1, @show_files %><%= hidden_field_tag 'show_files', 0, :id => nil %> <%=l(:label_attachment_plural)%><br />
                 <%= check_box_tag 'show_documents', 1, @show_documents %><%= hidden_field_tag 'show_documents', 0, :id => nil %> <%=l(:label_document_plural)%><br />
                 <%= check_box_tag 'show_wiki_edits', 1, @show_wiki_edits %><%= hidden_field_tag 'show_wiki_edits', 0, :id => nil %> <%=l(:label_wiki_edit_plural)%>
             </p>
             <p class="textcenter"><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
             <% end %>
             </div>
             <% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
               <h3><%= day_name(day.cwday) %> <%= day.day %></h3>
               <ul>
               <% @events_by_day[day].sort {|x,y| y.created_on <=> x.created_on }.each do |e| %>
                 <li><p>
                 <% if e.is_a? Issue %>
-                  <%= e.created_on.strftime("%H:%M") %> <%= link_to "#{e.tracker.name} ##{e.id}", :controller => 'issues', :action => 'show', :id => e %> (<%= e.status.name %>): <%=h e.subject %><br />
+                  <%= e.created_on.strftime("%H:%M") %> <%= link_to_issue e %>: <%=h e.subject %><br />
                       <i><%= e.author.name %></i>
                 <% elsif e.is_a? News %>
                   <%= e.created_on.strftime("%H:%M") %> <%=l(:label_news)%>: <%= link_to h(e.title), :controller => 'news', :action => 'show', :id => e %><br />
                       <% unless e.summary.empty? %><%=h e.summary %><br /><% end %>
                       <i><%= e.author.name %></i>
                 <% elsif (e.is_a? Attachment) and (e.container.is_a? Version) %>
                   <%= e.created_on.strftime("%H:%M") %> <%=l(:label_attachment)%> (<%=h e.container.name %>): <%= link_to e.filename, :controller => 'projects', :action => 'list_files', :id => @project %><br />
                     <i><%= e.author.name %></i>
                 <% elsif (e.is_a? Attachment) and (e.container.is_a? Document) %>
                   <%= e.created_on.strftime("%H:%M") %> <%=l(:label_attachment)%>: <%= e.filename %> (<%= link_to h(e.container.title), :controller => 'documents', :action => 'show', :id => e.container %>)<br />
                     <i><%= e.author.name %></i>
                 <% elsif e.is_a? Document %>
                   <%= e.created_on.strftime("%H:%M") %> <%=l(:label_document)%>: <%= link_to h(e.title), :controller => 'documents', :action => 'show', :id => e %><br />
                 <% elsif e.is_a? WikiContent.versioned_class %>
                   <%= e.created_on.strftime("%H:%M") %> <%=l(:label_wiki_edit)%>: <%= link_to h(WikiPage.pretty_title(e.title)), :controller => 'wiki', :page => e.title %> (<%= link_to '#' + e.version.to_s, :controller => 'wiki', :page => e.title, :version => e.version %>)<br />
                   <% unless e.comment.blank? %><em><%=h e.comment %></em><% end %>
                 <% elsif e.is_a? Changeset %>
                   <%= e.created_on.strftime("%H:%M") %> <%=l(:label_revision)%> <%= link_to h(e.revision), :controller => 'repositories', :action => 'revision', :id => @project, :rev => e.revision %><br />
                   <em><%=h e.committer.blank? ? "anonymous" : e.committer %><%= h(": #{e.comment}") unless e.comment.blank? %></em>
                 <% end %>
                 </p></li>
               <% end %>
               </ul>
             <% end %>
             <% if @events_by_day.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
             <div style="float:left;">
             <%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")),
                                 {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
                                 {:href => url_for(:action => 'activity', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
                                 %>
             </div>
             <div style="float:right;">
             <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'),
                                 {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
                                 {:href => url_for(:action => 'activity', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
                                 %>&nbsp;
             </div>
             <br />
             </div>

app/views/projects/calendar.rhtml +1 -1

             <h2><%= l(:label_calendar) %></h2>
             <% form_tag do %>
             <table width="100%">
             <tr>
             <td align="left" style="width:15%">
                 <%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")),
                                     {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] }},
                                     {:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects])}
                                     %>
             </td>
             <td align="center" style="width:55%">
                 <%= select_month(@month, :prefix => "month", :discard_type => true) %>
                 <%= select_year(@year, :prefix => "year", :discard_type => true) %>
                 <%= submit_tag l(:button_submit), :class => "button-small" %>
             </td>
             <td align="left" style="width:15%">
                 <a href="#" onclick="Element.toggle('trackerselect')"><%= l(:label_options) %></a>
                 <div id="trackerselect" class="rightbox overlay" style="width:140px; display:none;">
                 <p><strong><%=l(:label_tracker_plural)%></strong></p>
                 <% @trackers.each do |tracker| %>
                   <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
                   <%= tracker.name %><br />
                 <% end %>
                 <% if @project.children.any? %>
                 <p><strong><%=l(:label_subproject_plural)%></strong></p>
                 <%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%= l(:general_text_Yes) %>
                 <% end %>
                 <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
                 </div>
             </td>
             <td align="right" style="width:15%">
                 <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'),
                                     {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] }},
                                     {:href => url_for(:action => 'calendar', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects])}
                                     %>&nbsp;
             </td>
             </tr>
             </table>
             <% end %>
             <table class="list with-cells">
             <thead>
             <tr>
             <th></th>
             <% 1.upto(7) do |d| %>
                 <th style="width:14%"><%= day_name(d) %></th>
             <% end %>
             </tr>
             </thead>
             <tbody>
             <tr style="height:100px">
             <% day = @date_from
             while day <= @date_to
             	if day.cwday == 1 %>
             	<th><%= day.cweek %></th>
             	<% end %>
             	<td valign="top" class="<%= day.month==@month ? "even" : "odd" %>" style="width:14%; <%= Date.today == day ? 'background:#FDFED0;' : '' %>">
             	<p class="textright"><%= day==Date.today ? "<b>#{day.day}</b>" : day.day %></p>
             	<% ((@ending_events_by_days[day] || []) + (@starting_events_by_days[day] || [])).uniq.each do |i| %>
             	    <% if i.is_a? Issue %>
             	    <div class="tooltip">
             		<%= if day == i.start_date and day == i.due_date
             		    image_tag('arrow_bw.png')
             		elsif day == i.start_date
             		    image_tag('arrow_from.png')
             		elsif day == i.due_date
             		    image_tag('arrow_to.png')
             		end %>
-            		<small><%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i } %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small>
+            		<small><%= link_to_issue i %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small>
                     <span class="tip">
                     <%= render :partial => "issues/tooltip", :locals => { :issue => i }%>
                     </span>
             		</div>
             		<% else %>
                     <%= image_tag('milestone.png') %> <small><%= "#{l(:label_version)}: #{i.name}" %></small>
             		<% end %>
             	<% end %>
                 </td>
             	<%= '</tr><tr style="height:100px">' if day.cwday >= 7 and day!=@date_to %>
             	<%
             	day = day + 1
             end %>
             </tr>
             </tbody>
             </table>
             <%= image_tag 'arrow_from.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_day) %><br />
             <%= image_tag 'arrow_to.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_end_day) %><br />
             <%= image_tag 'arrow_bw.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_end_day) %><br />

app/views/projects/changelog.rhtml +1 -1

             <h2><%=l(:label_change_log)%></h2>
             <div>
             <div class="rightbox" style="width:140px;">
             <% form_tag do %>
             <p><strong><%=l(:label_tracker_plural)%></strong></p>
             <% @trackers.each do |tracker| %>
               <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
               <%= tracker.name %><br />
             <% end %>
             <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
             <% end %>
             </div>
             <% if @fixed_issues.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
             <% ver_id = nil
                @fixed_issues.each do |issue| %>
                 <% unless ver_id == issue.fixed_version_id %>
                 <% if ver_id %></ul><% end %>
                 <h3 class="icon22 icon22-package"><%= issue.fixed_version.name %></h3>
                 <p><%= format_date(issue.fixed_version.effective_date) %><br />
                 <%=h issue.fixed_version.description %></p>
                 <ul>
                 <% ver_id = issue.fixed_version_id
                 end %>
-                <li><%= link_to "#{issue.tracker.name} #{issue.id}", :controller => 'issues', :action => 'show', :id => issue %>: <%=h issue.subject %></li>
+                <li><%= link_to_issue issue %>: <%=h issue.subject %></li>
             <% end %>
             </div>

app/views/projects/gantt.rhtml +1 -1

             <div class="contextual">
             <%= l(:label_export_to) %>
             <%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :output => 'pdf'}, :class => 'icon icon-pdf' %>
             </div>
             <h2><%= l(:label_gantt) %></h2>
             <% form_tag do %>
             <table width="100%">
             <tr>
             <td align="left">
                 <input type="text" name="months" size="2" value="<%= @months %>" />
                 <%= l(:label_months_from) %>
                 <%= select_month(@month_from, :prefix => "month", :discard_type => true) %>
                 <%= select_year(@year_from, :prefix => "year", :discard_type => true) %>
                 <%= hidden_field_tag 'zoom', @zoom %>
                 <%= submit_tag l(:button_submit), :class => "button-small" %>
             </td>
             <td>
                 <a href="#" onclick="Element.toggle('trackerselect')"><%= l(:label_options) %></a>
                 <div id="trackerselect" class="rightbox overlay" style="width:140px; display: none;">
                 <p><strong><%=l(:label_tracker_plural)%></strong></p>
                 <% @trackers.each do |tracker| %>
                   <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
                   <%= tracker.name %><br />
                 <% end %>
                 <% if @project.children.any? %>
                 <p><strong><%=l(:label_subproject_plural)%></strong></p>
                 <%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%= l(:general_text_Yes) %>
                 <% end %>
                 <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
                 </div>
             </td>
             <td align="right">
             <%= if @zoom < 4
                 link_to image_tag('zoom_in.png'), {:zoom => (@zoom+1), :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects]}
               else
                 image_tag 'zoom_in_g.png'
               end %>
             <%= if @zoom > 1
                 link_to image_tag('zoom_out.png'),{:zoom => (@zoom-1), :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects]}
               else
                 image_tag 'zoom_out_g.png'
               end %>
             </td>
             </tr>
             </table>
             <% end %>
             <% zoom = 1
             @zoom.times { zoom = zoom * 2 }
             subject_width = 260
             header_heigth = 18
             headers_height = header_heigth
             show_weeks = false
             show_days = false
             if @zoom >1
                 show_weeks = true
                 headers_height = 2*header_heigth
                 if @zoom > 2
                     show_days = true
                     headers_height = 3*header_heigth
                 end
             end
             g_width = (@date_to - @date_from + 1)*zoom
             g_height = [(20 * @events.length + 6)+150, 206].max
             t_height = g_height + headers_height
             %>
             <table width="100%" style="border:0; border-collapse: collapse;">
             <tr>
             <td style="width:260px;">
             <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
             <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div>
             <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" class="gantt_hdr"></div>
             <%
             #
             # Tasks subjects
             #
             top = headers_height + 8
             @events.each do |i| %>
                 <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small>
                 <% if i.is_a? Issue %>
-                  	<%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i }, :title => "#{i.subject}" %>:
+                  	<%= link_to_issue i %>:
                   	<%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %>
               	<% else %>
                   	<strong><%= "#{l(:label_version)}: #{i.name}" %></strong>
               	<% end %>
               	</small></div>
                 <% top = top + 20
             end %>
             </div>
             </td>
             <td>
             <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
             <div style="width:<%= g_width-1 %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr">&nbsp;</div>
             <%
             #
             # Months headers
             #
             month_f = @date_from
             left = 0
             height = (show_weeks ? header_heigth : header_heigth + g_height)
             @months.times do
             	width = ((month_f >> 1) - month_f) * zoom - 1
             	%>
             	<div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
             	<%= link_to "#{month_f.year}-#{month_f.month}", { :year => month_f.year, :month => month_f.month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] }, :title => "#{month_name(month_f.month)} #{month_f.year}"%>
             	</div>
             	<%
             	left = left + width + 1
             	month_f = month_f >> 1
             end %>
             <%
             #
             # Weeks headers
             #
             if show_weeks
             	left = 0
             	height = (show_days ? header_heigth-1 : header_heigth-1 + g_height)
             	if @date_from.cwday == 1
             	    # @date_from is monday
                     week_f = @date_from
             	else
             	    # find next monday after @date_from
             		week_f = @date_from + (7 - @date_from.cwday + 1)
             		width = (7 - @date_from.cwday + 1) * zoom-1
             		%>
             		<div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">&nbsp;</div>
             		<%
             		left = left + width+1
             	end %>
             	<%
             	while week_f <= @date_to
             		width = (week_f + 6 <= @date_to) ? 7 * zoom -1 : (@date_to - week_f + 1) * zoom-1
             		%>
             		<div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
             		<small><%= week_f.cweek if width >= 16 %></small>
             		</div>
             		<%
             		left = left + width+1
             		week_f = week_f+7
             	end
             end %>
             <%
             #
             # Days headers
             #
             if show_days
             	left = 0
             	height = g_height + header_heigth - 1
             	wday = @date_from.cwday
             	(@date_to - @date_from + 1).to_i.times do
             	width =  zoom - 1
             	%>
             	<div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" class="gantt_hdr">
             	<%= day_name(wday)[0,1] %>
             	</div>
             	<%
             	left = left + width+1
             	wday = wday + 1
             	wday = 1 if wday > 7
             	end
             end %>
             <%
             #
             # Today red line
             #
             if Date.today >= @date_from and Date.today <= @date_to %>
                 <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= ((Date.today-@date_from+1)*zoom).floor()-1 %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
             <% end %>
             <%
             #
             # Tasks
             #
             top = headers_height + 10
             @events.each do |i|
               if i.is_a? Issue
             	i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
             	i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
             	i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
             	i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
             	i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
             	i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
             	i_left = ((i_start_date - @date_from)*zoom).floor
             	i_width = ((i_end_date - i_start_date + 1)*zoom).floor - 2                  # total width of the issue (- 2 for left and right borders)
             	d_width = ((i_done_date - i_start_date)*zoom).floor - 2                     # done width
             	l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor - 2 : 0 # delay width
             	%>
             	<div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task task_todo">&nbsp;</div>
             	<% if l_width > 0 %>
             	    <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="task task_late">&nbsp;</div>
             	<% end %>
             	<% if d_width > 0 %>
             	    <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= d_width %>px;" class="task task_done">&nbsp;</div>
             	<% end %>
             	<div style="top:<%= top %>px;left:<%= i_left + i_width + 5 %>px;background:#fff;" class="task">
             	<%= i.status.name %>
             	<%= (i.done_ratio).to_i %>%
             	</div>
             	<% # === tooltip === %>
             	<div class="tooltip" style="position: absolute;top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;height:12px;">
             	<span class="tip">
                 <%= render :partial => "issues/tooltip", :locals => { :issue => i }%>
             	</span></div>
             <% else
                 i_left = ((i.start_date - @date_from)*zoom).floor
                 %>
                 <div style="top:<%= top %>px;left:<%= i_left %>px;width:15px;" class="task milestone">&nbsp;</div>
             	<div style="top:<%= top %>px;left:<%= i_left + 12 %>px;background:#fff;" class="task">
             	<strong><%= i.name %></strong>
             	</div>
             <% end %>
             	<% top = top + 20
             end %>
             </div>
             </td>
             </tr>
             </table>
             <table width="100%">
             <tr>
             <td align="left"><%= link_to ('&#171; ' + l(:label_previous)), :year => (@date_from << @months).year, :month => (@date_from << @months).month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] %></td>
             <td align="right"><%= link_to (l(:label_next) + ' &#187;'), :year => (@date_from >> @months).year, :month => (@date_from >> @months).month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] %></td>
             </tr>
             </table>

app/views/projects/roadmap.rhtml +2 -3

             <h2><%=l(:label_roadmap)%></h2>
             <div>
             <div class="rightbox" style="width:140px;">
             <% form_tag do %>
             <p><strong><%=l(:label_tracker_plural)%></strong></p>
             <% @trackers.each do |tracker| %>
               <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
               <%= tracker.name %><br />
             <% end %>
             <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
             <% end %>
             </div>
             <% if @versions.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
             <% @versions.each do |version| %>
                 <h3 class="icon22 icon22-package"><%= version.name %></h3>
                 <p><%=h version.description %></p>
                 <p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>
                 <% issues = version.fixed_issues.find(:all,
                                              :include => :status,
                                              :conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
                                              :order => "position")
                    total = issues.size
                    complete = issues.inject(0) {|c,i| i.status.is_closed? ? c + 1 : c }
                    percentComplete = total == 0 ? 100 : (100 / total * complete).floor
                    percentIncomplete = 100 - percentComplete
                 %>
                 <table class="progress">
                   <tr>
             	<% if percentComplete > 0 %>
                       <td class="closed" style="width: <%= percentComplete %>%"></td>
                     <% end; if percentIncomplete > 0 %>
                       <td class="open" style="width: <%= percentIncomplete %>%"></td>
                     <% end %>
                   </tr>
                 </table>
                 <em><%= link_to(complete, :controller => 'projects', :action => 'list_issues', :id => @project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %> <%= lwr(:label_closed_issues, complete) %> (<%= percentComplete %>%) &#160;
                     <%= link_to((total - complete), :controller => 'projects', :action => 'list_issues', :id => @project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %> <%= lwr(:label_open_issues, total - complete)%> (<%= percentIncomplete %>%)</em>
                 <br />
                 <br />
                 <ul>
                   <% if total == 0 %>
                     <li><%=l(:label_roadmap_no_issues)%></li>
                   <% else %>
                     <% issues.each do |issue| %>
                       <li>
-                        <%= link = link_to("#{issue.tracker.name} ##{issue.id}", :controller => 'issues', :action => 'show', :id => issue)
+                        <%= link = link_to_issue(issue)
-                                   issue.status.is_closed? ? content_tag("del", link) : link %>
+                            issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %>
-                        : <%=h issue.subject %>
                         <%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
                       </li>
                     <% end %>
                   <% end %>
                 </ul>
             <% end %>
             </div>

app/views/projects/search.rhtml +1 -1

             <h2><%= l(:label_search) %></h2>
             <div class="box">
             <% form_tag({:action => 'search', :id => @project}, :method => :get) do %>
             <p><%= text_field_tag 'q', @question, :size => 30 %>
             <%= check_box_tag 'scope[]', 'issues', (@scope.include? 'issues') %> <label><%= l(:label_issue_plural) %></label>
             <% if @project.repository %>
             <%= check_box_tag 'scope[]', 'changesets', (@scope.include? 'changesets') %> <label><%= l(:label_revision_plural) %></label>
             <% end %>
             <%= check_box_tag 'scope[]', 'news', (@scope.include? 'news') %> <label><%= l(:label_news_plural) %></label>
             <%= check_box_tag 'scope[]', 'documents', (@scope.include? 'documents') %> <label><%= l(:label_document_plural) %></label>
             <% if @project.wiki %>
             <%= check_box_tag 'scope[]', 'wiki', (@scope.include? 'wiki') %> <label><%= l(:label_wiki) %></label>
             <% end %>
             <br />
             <%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></p>
             <%= submit_tag l(:button_submit), :name => 'submit' %>
             <% end %>
             </div>
             <% if @results %>
                 <h3><%= lwr(:label_result, @results.length) %></h3>
                 <ul>
                   <% @results.each do |e| %>
                     <li><p>
                     <% if e.is_a? Issue %>
-                        <%= link_to "#{e.tracker.name} ##{e.id}", :controller => 'issues', :action => 'show', :id => e %>: <%= highlight_tokens(h(e.subject), @tokens) %><br />
+                        <%= link_to_issue e %>: <%= highlight_tokens(h(e.subject), @tokens) %><br />
                         <%= highlight_tokens(e.description, @tokens) %><br />
                         <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
                     <% elsif e.is_a? News %>
                         <%=l(:label_news)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'news', :action => 'show', :id => e %><br />
                         <%= highlight_tokens(e.description, @tokens) %><br />
                         <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
                     <% elsif e.is_a? Document %>
                         <%=l(:label_document)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'documents', :action => 'show', :id => e %><br />
                         <%= highlight_tokens(e.description, @tokens) %><br />
                         <i><%= format_time(e.created_on) %></i>
                     <% elsif e.is_a? WikiPage %>
                         <%=l(:label_wiki)%>: <%= link_to highlight_tokens(h(e.pretty_title), @tokens), :controller => 'wiki', :action => 'index', :id => @project, :page => e.title %><br />
                         <%= highlight_tokens(e.content.text, @tokens) %><br />
                         <i><%= e.content.author ? e.content.author.name : "Anonymous" %>, <%= format_time(e.content.updated_on) %></i>
                     <% elsif e.is_a? Changeset %>
                         <%=l(:label_revision)%> <%= link_to h(e.revision), :controller => 'repositories', :action => 'revision', :id => @project, :rev => e.revision %><br />
                         <%= highlight_tokens(e.comment, @tokens) %><br />
                         <em><%= e.committer.blank? ? e.committer : "Anonymous" %>, <%= format_time(e.committed_on) %></em>
                     <% end %>
                     </p></li>
                   <% end %>
                 </ul>
             <% 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