Patch #6247 ยป redmine100_version_number_display.patch
| app/controllers/gantts_controller.rb (working copy) | ||
|---|---|---|
| 1 |
# Modified by venkat.bagam@rknowsys.com |
|
| 2 | ||
| 1 | 3 |
class GanttsController < ApplicationController |
| 2 | 4 |
before_filter :find_optional_project |
| 3 | 5 | |
| ... | ... | |
| 11 | 13 |
include SortHelper |
| 12 | 14 |
include Redmine::Export::PDF |
| 13 | 15 |
|
| 16 |
# Modified to include :fixed_version |
|
| 14 | 17 |
def show |
| 15 | 18 |
@gantt = Redmine::Helpers::Gantt.new(params) |
| 16 | 19 |
retrieve_query |
| ... | ... | |
| 18 | 21 |
if @query.valid? |
| 19 | 22 |
events = [] |
| 20 | 23 |
# Issues that have start and due dates |
| 21 |
events += @query.issues(:include => [:tracker, :assigned_to, :priority], |
|
| 24 |
events += @query.issues(:include => [:tracker, :assigned_to, :priority, :fixed_version],
|
|
| 22 | 25 |
:order => "start_date, due_date", |
| 23 | 26 |
: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)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to] |
| 24 | 27 |
) |
| app/helpers/issues_helper.rb (working copy) | ||
|---|---|---|
| 15 | 15 |
# along with this program; if not, write to the Free Software |
| 16 | 16 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
| 17 | 17 | |
| 18 |
# Modified by venkat.bagam@rknowsys.com |
|
| 19 | ||
| 18 | 20 |
module IssuesHelper |
| 19 | 21 |
include ApplicationHelper |
| 20 | 22 | |
| ... | ... | |
| 29 | 31 |
end |
| 30 | 32 |
end |
| 31 | 33 |
|
| 34 |
# Modified to display Version number in Issue tool tip. |
|
| 32 | 35 |
def render_issue_tooltip(issue) |
| 33 | 36 |
@cached_label_start_date ||= l(:field_start_date) |
| 34 | 37 |
@cached_label_due_date ||= l(:field_due_date) |
| 35 | 38 |
@cached_label_assigned_to ||= l(:field_assigned_to) |
| 36 | 39 |
@cached_label_priority ||= l(:field_priority) |
| 37 | 40 |
|
| 41 |
issue_version = l(:unknown) |
|
| 42 |
issue_version = issue.fixed_version.name if issue.fixed_version |
|
| 43 |
|
|
| 38 | 44 |
link_to_issue(issue) + "<br /><br />" + |
| 45 |
"<strong>#{l(:label_version)}</strong>: #{issue_version}<br />" +
|
|
| 39 | 46 |
"<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />" +
|
| 40 | 47 |
"<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />" +
|
| 41 | 48 |
"<strong>#{@cached_label_assigned_to}</strong>: #{issue.assigned_to}<br />" +
|
| config/locales/en.yml (working copy) | ||
|---|---|---|
| 1 |
#Modified by venkat.bagam@rknowsys.com |
|
| 1 | 2 |
en: |
| 2 | 3 |
date: |
| 3 | 4 |
formats: |
| ... | ... | |
| 903 | 904 |
enumeration_activities: Activities (time tracking) |
| 904 | 905 |
enumeration_system_activity: System Activity |
| 905 | 906 | |
| 907 |
unknown: Unknown |
|
| 908 |
|
|