jro_apps/redmine Commit - r49:c83e79487171

git-svn-id: http://redmine.rubyforge.org/svn/trunk@51 e93f8b46-1217-0410-a6f0-8f06a7374b81

Jean-Philippe Lang -

r49:c83e79487171

parent child

Context file:

r49:c83e79487171

Collapse all files

redmine/app/controllers/documents_controller.rb +3 0

             # 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 DocumentsController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize
               def show
                 @attachments = @document.attachments.find(:all, :order => "created_on DESC")
               end
               def edit
                 @categories = Enumeration::get_values('DCAT')
                 if request.post? and @document.update_attributes(params[:document])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @document
                 end
               end
               def destroy
                 @document.destroy
                 redirect_to :controller => 'projects', :action => 'list_documents', :id => @project
               end
               def download
                 @attachment = @document.attachments.find(params[:attachment_id])
                 @attachment.increment_download
                 send_file @attachment.diskfile, :filename => @attachment.filename
+              rescue
+                flash.now[:notice] = l(:notice_file_not_found)
+                render :text => "", :layout => true, :status => 404
               end
               def add_attachment
                 # 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
                   @attachment.save
                 end
                 redirect_to :action => 'show', :id => @document
               end
               def destroy_attachment
                 @document.attachments.find(params[:attachment_id]).destroy
                 redirect_to :action => 'show', :id => @document
               end
             private
               def find_project
                 @document = Document.find(params[:id])
                 @project = @document.project
               end
             end

redmine/app/controllers/issues_controller.rb +3 0

             # 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)
               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
                     # 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[:history][:notes].empty?
                   @history = @issue.histories.build(params[:history])
                   @history.author_id = self.logged_in_user.id if self.logged_in_user
                   @history.status = @issue.status
                   if @history.save
                     flash[:notice] = l(:notice_successful_update)
                     Mailer.deliver_issue_add_note(@history) 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
                 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])
                     if @issue.save
                       flash[:notice] = l(:notice_successful_update)
                       Mailer.deliver_issue_change_status(@issue) 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

redmine/app/controllers/projects_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 ProjectsController < ApplicationController
               layout 'base', :except => :export_issues_pdf
               before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
               before_filter :require_admin, :only => [ :add, :destroy ]
               helper :sort
               include SortHelper
               helper :search_filter
               include SearchFilterHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               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']
                 @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]
                   @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 @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]
                   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 @project.update_attributes(params[:project])
                     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
               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
                   params[:attachments].each { |a|
                     @attachment = @issue.attachments.build(:file => a, :author => self.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
                     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 'issues.id', 'desc'
                 sort_update
                 search_filter_init_list_issues
                 search_filter_update if params[:set_filter]
                 @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
                 @issue_count = Issue.count(:include => [:status, :project], :conditions => search_filter_clause)
                 @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 => search_filter_clause,
             						:limit  =>  @issue_pages.items_per_page,
             						:offset =>  @issue_pages.current.offset
                 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
                 search_filter_init_list_issues
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project, :custom_values ],
             						:conditions => search_filter_clause
                 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
                 search_filter_init_list_issues
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project, :custom_values ],
             						:conditions => search_filter_clause
                 @options_for_rfpdf ||= {}
                 @options_for_rfpdf[:file_name] = "export.pdf"
               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|
                     # category is project dependent
                     i.category = nil unless i.project_id == new_project.id
                     # 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
               # 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
                 if request.post?
                   # Save the attachment
                   if params[:attachment][:file].size > 0
                     @attachment = @project.versions.find(params[:version_id]).attachments.build(params[:attachment])
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                     if @attachment.save
                       flash[:notice] = l(:notice_successful_create)
                       redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                     end
                   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] ).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, :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] ).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_documentss] == "0"
+                unless params[:show_documents] == "0"
                   Attachment.find(:all, :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] ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_documents = 1
                 end
               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
             end

redmine/app/controllers/reports_controller.rb +36 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class ReportsController < ApplicationController
              	layout 'base'
             	before_filter :find_project, :authorize
               def issue_report
                 @statuses = IssueStatus.find_all
                 case params[:detail]
                 when "tracker"
                   @field = "tracker_id"
                   @rows = Tracker.find_all
                   @data = issues_by_tracker
                   @report_title = l(:field_tracker)
                   render :template => "reports/issue_report_details"
                 when "priority"
                   @field = "priority_id"
                   @rows = Enumeration::get_values('IPRI')
                   @data = issues_by_priority
                   @report_title = l(:field_priority)
                   render :template => "reports/issue_report_details"
                 when "category"
                   @field = "category_id"
                   @rows = @project.issue_categories
                   @data = issues_by_category
                   @report_title = l(:field_category)
                   render :template => "reports/issue_report_details"
                 when "author"
                   @field = "author_id"
                   @rows = @project.members.collect { |m| m.user }
                   @data = issues_by_author
                   @report_title = l(:field_author)
                   render :template => "reports/issue_report_details"
                 else
                   @trackers = Tracker.find(:all)
                   @priorities = Enumeration::get_values('IPRI')
                   @categories = @project.issue_categories
                   @authors = @project.members.collect { |m| m.user }
                   issues_by_tracker
                   issues_by_priority
                   issues_by_category
                   issues_by_author
                   render :template => "reports/issue_report"
                 end
               end
+              def delays
+                @trackers = Tracker.find(:all)
+                if request.get?
+                  @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }
+                else
+                  @selected_tracker_ids = params[:tracker_ids].collect { |id| id.to_i.to_s } if params[:tracker_ids] and params[:tracker_ids].is_a? Array
+                end
+                @selected_tracker_ids ||= []
+                @raw =
+                  ActiveRecord::Base.connection.select_all("SELECT datediff( a.created_on, b.created_on ) as delay, count(a.id) as total
+                  FROM issue_histories a, issue_histories b, issues i
+                  WHERE a.status_id =5
+                  AND a.issue_id = b.issue_id
+                  AND a.issue_id = i.id
+                  AND i.tracker_id in (#{@selected_tracker_ids.join(',')})
+                  AND b.id = (
+                  SELECT min( c.id )
+                  FROM issue_histories c
+                  WHERE b.issue_id = c.issue_id )
+                  GROUP BY delay") unless @selected_tracker_ids.empty?
+                @raw ||=[]
+                @x_from = 0
+                @x_to = 0
+                @y_from = 0
+                @y_to = 0
+                @sum_total = 0
+                @sum_delay = 0
+                @raw.each do |r|
+                  @x_to = [r['delay'].to_i, @x_to].max
+                  @y_to = [r['total'].to_i, @y_to].max
+                  @sum_total = @sum_total + r['total'].to_i
+                  @sum_delay = @sum_delay + r['total'].to_i * r['delay'].to_i
+                end
+              end
             private
             	# Find project of id params[:id]
             	def find_project
             		@project = Project.find(params[:id])
             	end
             	def issues_by_tracker
                 @issues_by_tracker ||=
                     ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               t.id as tracker_id,
                                                               count(i.id) as total
                                                             from
                                                               issues i, issue_statuses s, trackers t
                                                             where
                                                               i.status_id=s.id
                                                               and i.tracker_id=t.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, t.id")
             	end
             	def issues_by_priority
                 @issues_by_priority ||=
                   ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               p.id as priority_id,
                                                               count(i.id) as total
                                                             from
                                                               issues i, issue_statuses s, enumerations p
                                                             where
                                                               i.status_id=s.id
                                                               and i.priority_id=p.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, p.id")
             	end
             	def issues_by_category
                 @issues_by_category ||=
                   ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               c.id as category_id,
                                                               count(i.id) as total
                                                             from
                                                               issues i, issue_statuses s, issue_categories c
                                                             where
                                                               i.status_id=s.id
                                                               and i.category_id=c.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, c.id")
             	end
             	def issues_by_author
                 @issues_by_author ||=
                   ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               a.id as author_id,
                                                               count(i.id) as total
                                                             from
                                                               issues i, issue_statuses s, users a
                                                             where
                                                               i.status_id=s.id
                                                               and i.author_id=a.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, a.id")
             	end
             end

redmine/app/controllers/versions_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 VersionsController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize
               def edit
                 if request.post? and @version.update_attributes(params[:version])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project
                 end
               end
               def destroy
                 @version.destroy
                 redirect_to :controller => 'projects', :action => 'settings', :id => @project
               rescue
                 flash[:notice] = "Unable to delete version"
                 redirect_to :controller => 'projects', :action => 'settings', :id => @project
               end
               def download
                 @attachment = @version.attachments.find(params[:attachment_id])
                 @attachment.increment_download
                 send_file @attachment.diskfile, :filename => @attachment.filename
               rescue
-                flash[:notice] = l(:notice_file_not_found)
+                flash.now[:notice] = l(:notice_file_not_found)
-                redirect_to :controller => 'projects', :action => 'list_files', :id => @project
+                render :text => "", :layout => true, :status => 404
               end
               def destroy_file
                 @version.attachments.find(params[:attachment_id]).destroy
                 flash[:notice] = l(:notice_successful_delete)
                 redirect_to :controller => 'projects', :action => 'list_files', :id => @project
               end
             private
               def find_project
                 @version = Version.find(params[:id])
                 @project = @version.project
               end
             end

redmine/app/helpers/ifpdf_helper.rb +6 -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.
             require 'iconv'
             module IfpdfHelper
               class IFPDF < FPDF
+                attr_accessor :footer_date
                 def Cell(w,h=0,txt='',border=0,ln=0,align='',fill=0,link='')
                   @ic ||= Iconv.new('ISO-8859-1', 'UTF-8')
                   super w,h,@ic.iconv(txt),border,ln,align,fill,link
                 end
                 def MultiCell(w,h,txt,border=0,align='J',fill=0)
                   @ic ||= Iconv.new('ISO-8859-1', 'UTF-8')
                   super w,h,txt,border,align,fill
                 end
                 def Footer
+                  SetFont('Helvetica', 'I', 8)
+                  SetY(-15)
+                  SetX(15)
+                  Cell(0, 5, @footer_date, 0, 0, 'L')
                   SetY(-15)
                   SetX(-30)
-                  SetFont('Helvetica', 'I', 8)
                   Cell(0, 5, PageNo().to_s + '/{nb}', 0, 0, 'C')
                 end
               end
             end

redmine/app/views/issues/export_pdf.rfpdf +1 0

             <%	pdf=IfpdfHelper::IFPDF.new
             	pdf.AliasNbPages
+            	pdf.footer_date = format_date(Date.today)
             	pdf.AddPage
             	render :partial => 'issues/pdf', :locals => { :pdf => pdf, :issue => @issue }
             %>
             <%= pdf.Output %>

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

             <h2><%=l(:label_activity)%></h2>
             <div>
             <div class="rightbox">
               <%= start_form_tag %>
             <p><%= select_month(@month, :prefix => "month", :discard_type => true) %>
             <%= select_year(@year, :prefix => "year", :discard_type => true) %></p>
                 <%= check_box_tag 'show_issues', 1, @show_issues %><%= hidden_field_tag 'show_issues', 0 %> <%=l(:label_issue_plural)%><br />
                 <%= check_box_tag 'show_news', 1, @show_news %><%= hidden_field_tag 'show_news', 0 %> <%=l(:label_news_plural)%><br />
                 <%= check_box_tag 'show_files', 1, @show_files %><%= hidden_field_tag 'show_files', 0 %> <%=l(:label_attachment_plural)%><br />
                 <%= check_box_tag 'show_documents', 1, @show_documents %><%= hidden_field_tag 'show_documents', 0 %> <%=l(:label_document_plural)%><br />
                 <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
               <%= end_form_tag %>
               </div>
             <% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
-              <h3><%= format_date(day) %></h3>
+              <h3><%= day_name(day.cwday) %> <%= format_date(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") %> <%= e.tracker.name %> <%= link_to e.long_id, :controller => 'issues', :action => 'show', :id => e %> (<%= e.status.name %>): <%= e.subject %><br />
                       <i><%= e.author.name %></i>
                 <% elsif e.is_a? News %>
                   <%= e.created_on.strftime("%H:%M") %> <%=l(:label_news)%>: <%= link_to e.title, :controller => 'news', :action => 'show', :id => e %><br />
                       <% unless e.summary.empty? %><%= 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)%> (Version <%= 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_document)%>: <%= link_to e.container.title, :controller => 'documents', :action => 'show', :id => e %><br />
                     <i><%= e.author.name %></i>
                 <% end %>
                 </p></li>
               <% end %>
               </ul>
             <% end %>
             <% if @events_by_day.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
             <br />
             </div>

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

             <h2><%=l(:label_change_log)%></h2>
             <div>
             <div class="rightbox" style="width:140px;">
             <%= start_form_tag %>
             <strong><%=l(:label_tracker_plural)%></strong><br />
             <% @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_form_tag %>
             </div>
             <% ver_id = nil
                @fixed_issues.each do |issue| %>
                 <% unless ver_id == issue.fixed_version_id %>
                 <% if ver_id %></ul><% end %>
-                <p><strong><%= issue.fixed_version.name %></strong> - <%= format_date(issue.fixed_version.effective_date) %><br />
+                <h3><%= l(:label_version) %>: <%= 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.long_id, :controller => 'issues', :action => 'show', :id => issue %> [<%= issue.tracker.name %>]: <%= issue.subject %></li>
             <% end %>
             </div>

redmine/app/views/projects/export_issues_pdf.rfpdf +1 0

             <%	pdf=IfpdfHelper::IFPDF.new
             	pdf.AliasNbPages
+            	pdf.footer_date = format_date(Date.today)
             	pdf.AddPage
             	@issues.each {|i|
             		render :partial => 'issues/pdf', :locals => { :pdf => pdf, :issue => i }
             		pdf.AddPage
             	}
             %>
             <%= pdf.Output %>

redmine/app/views/projects/gantt.rfpdf +13 -6

             <%
             pdf=IfpdfHelper::IFPDF.new
             pdf.AliasNbPages
+            pdf.footer_date = format_date(Date.today)
             pdf.AddPage("L")
+            pdf.SetFont('Arial','B',12)
+            pdf.SetX(15)
+            pdf.Cell(70, 20, @project.name)
+            pdf.Ln
             pdf.SetFont('Arial','B',9)
             subject_width = 70
             header_heigth = 5
             headers_heigth = header_heigth
             show_weeks = false
             show_days = false
             if @months < 7
                 show_weeks = true
                 headers_heigth = 2*header_heigth
                 if @months < 3
                     show_days = true
                     headers_heigth = 3*header_heigth
                 end
             end
             g_width = 210
             zoom = (g_width) / (@date_to - @date_from + 1)
             g_height = 120
             t_height = g_height + headers_heigth
+            y_start = pdf.GetY
             #
             # Months headers
             #
             month_f = @date_from
             left = subject_width
             height = header_heigth
             @months.times do
             	width = ((month_f >> 1) - month_f) * zoom
-            	pdf.SetY(20)
+            	pdf.SetY(y_start)
             	pdf.SetX(left)
             	pdf.Cell(width, height, "#{month_f.year}-#{month_f.month}", "LTR", 0, "C")
             	left = left + width
             	month_f = month_f >> 1
             end
             #
             # Weeks headers
             #
             if show_weeks
             	left = subject_width
             	height = header_heigth
             	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
-            		pdf.SetY(25)
+            		pdf.SetY(y_start + header_heigth)
             		pdf.SetX(left)
             		pdf.Cell(width + 1, height, "", "LTR")
             		left = left + width+1
             	end
             	while week_f < @date_to
             		width = (week_f + 6 <= @date_to) ? 7 * zoom : (@date_to - week_f + 1) * zoom
-            		pdf.SetY(25)
+            		pdf.SetY(y_start + header_heigth)
             		pdf.SetX(left)
             		pdf.Cell(width, height, week_f.cweek.to_s, "LTR", 0, "C")
             		left = left + width
             		week_f = week_f+7
             	end
             end
             #
             # Days headers
             #
             if show_days
             	left = subject_width
             	height = header_heigth
             	wday = @date_from.cwday
             	pdf.SetFont('Arial','B',7)
             	(@date_to - @date_from + 1).to_i.times do
             		width = zoom
-            		pdf.SetY(30)
+            		pdf.SetY(y_start + 2 * header_heigth)
             		pdf.SetX(left)
             		pdf.Cell(width, height, day_name(wday)[0,1], "LTR", 0, "C")
             		left = left + width
             		wday = wday + 1
             		wday = 1 if wday > 7
             	end
             end
-            pdf.SetY(20)
+            pdf.SetY(y_start)
             pdf.SetX(15)
             pdf.Cell(subject_width+g_width-15, headers_heigth, "", 1)
             #
             # Tasks
             #
-            top = headers_heigth + 20
+            top = headers_heigth + y_start
             pdf.SetFont('Arial','B',7)
             @issues.each do |i|
             	pdf.SetY(top)
             	pdf.SetX(15)
             	pdf.Cell(subject_width-15, 5, i.id.to_s + " " + i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)'), "LR")
             	pdf.SetY(top)
             	pdf.SetX(subject_width)
             	pdf.Cell(g_width, 5, "", "LR")
             	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)*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)
             	i_width = ((i_end_date - i_start_date + 1)*zoom)
             	d_width = ((i_done_date - i_start_date)*zoom)
             	l_width = ((i_late_date - i_start_date+1)*zoom) if i_late_date
             	l_width ||= 0
             	pdf.SetY(top+1.5)
             	pdf.SetX(subject_width + i_left)
             	pdf.SetFillColor(200,200,200)
             	pdf.Cell(i_width, 2, "", 0, 0, "", 1)
             	if l_width > 0
             		pdf.SetY(top+1.5)
             		pdf.SetX(subject_width + i_left)
             		pdf.SetFillColor(255,100,100)
             		pdf.Cell(l_width, 2, "", 0, 0, "", 1)
             	end
             	if d_width > 0
             		pdf.SetY(top+1.5)
             		pdf.SetX(subject_width + i_left)
             		pdf.SetFillColor(100,100,255)
             		pdf.Cell(d_width, 2, "", 0, 0, "", 1)
             	end
             	pdf.SetY(top+1.5)
             	pdf.SetX(subject_width + i_left + i_width)
             	pdf.Cell(30, 2, "#{i.status.name} #{i.done_ratio}%")
             	top = top + 5
             	pdf.SetDrawColor(200, 200, 200)
             	pdf.Line(15, top, subject_width+g_width, top)
             	if pdf.GetY() > 180
             		pdf.AddPage("L")
             		top = 20
             		pdf.Line(15, top, subject_width+g_width, top)
             	end
             	pdf.SetDrawColor(0, 0, 0)
             end
             pdf.Line(15, top, subject_width+g_width, top)
             %>
             <%= pdf.Output %>

redmine/app/views/projects/list_issues.rhtml +9 -9

             <h2><%=l(:label_issue_plural)%></h2>
             <div class="topright">
             <small>
             <%= link_to 'PDF ', :action => 'export_issues_pdf', :id => @project %> |
             <%= link_to 'CSV ', :action => 'export_issues_csv', :id => @project %>
             </small>
             </div>
-            <form method="post" class="noborder">
+            <%= start_form_tag :action => 'list_issues' %>
             <table cellpadding=2>
               <tr>
-                <td><small><%=l(:field_status)%>:</small><br /><%= search_filter_tag 'status_id', :class => 'select-small' %></td>
+                <td valign="bottom"><small><%=l(:field_status)%>:</small><br /><%= search_filter_tag 'status_id', :class => 'select-small' %></td>
-                <td><small><%=l(:field_tracker)%>:</small><br /><%= search_filter_tag 'tracker_id', :class => 'select-small' %></td>
+                <td valign="bottom"><small><%=l(:field_tracker)%>:</small><br /><%= search_filter_tag 'tracker_id', :class => 'select-small' %></td>
-                <td><small><%=l(:field_priority)%>:</small><br /><%= search_filter_tag 'priority_id', :class => 'select-small' %></td>
+                <td valign="bottom"><small><%=l(:field_priority)%>:</small><br /><%= search_filter_tag 'priority_id', :class => 'select-small' %></td>
-                <td><small><%=l(:field_category)%>:</small><br /><%= search_filter_tag 'category_id', :class => 'select-small' %></td>
+                <td valign="bottom"><small><%=l(:field_category)%>:</small><br /><%= search_filter_tag 'category_id', :class => 'select-small' %></td>
-                <td><small><%=l(:field_fixed_version)%>:</small><br /><%= search_filter_tag 'fixed_version_id', :class => 'select-small' %></td>
+                <td valign="bottom"><small><%=l(:field_fixed_version)%>:</small><br /><%= search_filter_tag 'fixed_version_id', :class => 'select-small' %></td>
-                <td><small><%=l(:field_author)%>:</small><br /><%= search_filter_tag 'author_id', :class => 'select-small' %></td>
+                <td valign="bottom"><small><%=l(:field_author)%>:</small><br /><%= search_filter_tag 'author_id', :class => 'select-small' %></td>
-                <td><small><%=l(:field_assigned_to)%>:</small><br /><%= search_filter_tag 'assigned_to_id', :class => 'select-small' %></td>
+                <td valign="bottom"><small><%=l(:field_assigned_to)%>:</small><br /><%= search_filter_tag 'assigned_to_id', :class => 'select-small' %></td>
-                <td><small><%=l(:label_subproject_plural)%>:</small><br /><%= search_filter_tag 'subproject_id', :class => 'select-small' %></td>
+                <td valign="bottom"><small><%=l(:label_subproject_plural)%>:</small><br /><%= search_filter_tag 'subproject_id', :class => 'select-small' %></td>
                 <td valign="bottom">
                   <%= hidden_field_tag 'set_filter', 1 %>
                   <%= submit_tag l(:button_apply), :class => 'button-small' %>
                 </td>
                 <td valign="bottom">
                   <%= link_to l(:button_clear), :action => 'list_issues', :id => @project, :set_filter => 1 %>
                 </td>
               </tr>
             </table>
             <%= end_form_tag %>
              &nbsp;
             <table class="listTableContent">
                 <tr>
                 <td colspan="6" align="left"><small><%= check_all_links 'issues_form' %></small></td>
                 <td colspan="2" align="right">
                     <small><%= l(:label_per_page) %>:</small>
                     <%= start_form_tag %>
                     <%= select_tag 'per_page', options_for_select(@results_per_page_options, @results_per_page), :class => 'select-small'%>
                     <%= submit_tag l(:button_apply), :class => 'button-small'%>
                     <%= end_form_tag %>
                 </td>
                 </tr>
             </table>
             <%= start_form_tag({:controller => 'projects', :action => 'move_issues', :id => @project}, :id => 'issues_form' ) %>
             <table class="listTableContent">
                 <tr class="ListHead">
                     <td></td>
             		<%= sort_header_tag('issues.id', :caption => '#') %>
             		<%= sort_header_tag('issue_statuses.name', :caption => l(:field_status)) %>
             		<%= sort_header_tag('issues.tracker_id', :caption => l(:field_tracker)) %>
             		<th><%=l(:field_subject)%></th>
             		<%= sort_header_tag('users.lastname', :caption => l(:field_author)) %>
             		<%= sort_header_tag('issues.created_on', :caption => l(:field_created_on)) %>
             		<%= sort_header_tag('issues.updated_on', :caption => l(:field_updated_on)) %>
             	</tr>
             	<% for issue in @issues %>
             	<tr bgcolor="#<%= issue.status.html_color %>">
             	    <td width="15"><%= check_box_tag "issue_ids[]", issue.id %></td>
             		<td align="center"><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %></td>
             		<td align="center"><%= issue.status.name %></td>
             		<td align="center"><%= issue.tracker.name %></td>
             		<td><%= link_to issue.subject, :controller => 'issues', :action => 'show', :id => issue %></td>
             		<td align="center"><%= issue.author.display_name %></td>
             		<td align="center"><%= format_time(issue.created_on) %></td>
             		<td align="center"><%= format_time(issue.updated_on) %></td>
             	</tr>
             	<% end %>
             </table>
             <p>
             <%= pagination_links_full @issue_pages %>
             [ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
             </p>
             <%= submit_tag l(:button_move) %>
             <%= end_form_tag %>

redmine/app/views/reports/issue_report_details.rhtml +1 -1

             <h2><%=l(:label_report_plural)%></h2>
-            <strong><%=@report_title%></strong>
+            <h3><%=@report_title%></h3>
             <%= render :partial => 'details', :locals => { :data => @data, :field_name => @field, :rows => @rows } %>
             <br />
             <%= link_to l(:button_back), :action => 'issue_report' %>

redmine/app/views/welcome/index.rhtml +1 -1

             <div class="splitcontentleft">
                 <h2><%= $RDM_WELCOME_TITLE || l(:label_home) %></h2>
                 <p><%= $RDM_WELCOME_TEXT %></p>
               <div class="box">
             	<h3><%=l(:label_news_latest)%></h3>
             		<% for news in @news %>
             			<p>
             			<b><%= news.title %></b> (<%= link_to_user news.author %> <%= format_time(news.created_on) %> - <%= news.project.name %>)<br />
-            			<%= news.summary %><br />
+            			<% unless news.summary.empty? %><%= news.summary %><br /><% end %>
             			[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]
             			</p>
             			<hr />
             		<% end %>
             	</div>
             </div>
             <div class="splitcontentright">
             	<div class="box">
             	<h3><%=l(:label_project_latest)%></h3>
             		<ul>
             		<% for project in @projects %>
             			<li>
             			<%= link_to project.name, :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)<br />
             			<%= project.description %>
             			</li>
             		<% end %>
             		</ul>
             	</div>
             </div>

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