Merge branch 'master' of git@github.com:bradbeattie/redmine-graphs-plugin
Conflicts: app/controllers/graphs_controller.rb
This commit is contained in:
commit
3a8022566a
|
@ -145,6 +145,7 @@ class GraphsController < ApplicationController
|
|||
:x_label_format => "%b %d"
|
||||
})
|
||||
|
||||
|
||||
# Group issues
|
||||
issues_by_created_on = @version.fixed_issues.group_by {|issue| issue.created_on.to_date }.sort
|
||||
issues_by_updated_on = @version.fixed_issues.group_by {|issue| issue.updated_on.to_date }.sort
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
en:
|
||||
label_graphs: Graphs
|
||||
label_graphs_total_vs_closed_issues: Total issues vs. Closed issues
|
||||
label_graphs_old_issues: Open aging issues
|
||||
label_graphs_issue_growth: Total issues over time
|
||||
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Provides a link to the issue age graph on the issue index page
|
||||
class IssuesSidebarGraphHook < Redmine::Hook::ViewListener
|
||||
def view_issues_sidebar_issues_bottom(context = { })
|
||||
output = "<h3>Graphs</h3>"
|
||||
output = "<h3>#{l(:label_graphs)}</h3>"
|
||||
output << link_to(l(:label_graphs_old_issues), {:controller => 'graphs', :action => 'old_issues'}) if context[:project].nil?
|
||||
output << link_to(l(:label_graphs_old_issues), {:controller => 'graphs', :action => 'old_issues', :project_id => context[:project]}) unless context[:project].nil?
|
||||
output << "<br/>"
|
||||
|
@ -10,4 +10,4 @@ class IssuesSidebarGraphHook < Redmine::Hook::ViewListener
|
|||
output << "<br/>"
|
||||
return output
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue
Block a user