Merge pull request #45 from finnlabs/feature/rails3_add_core_dependency_to_engine

Feature/rails3 add core dependency to engine
pull/6827/head
sschu 12 years ago
commit 9f55dc195d
  1. 10
      app/controllers/issue_boxes_controller.rb
  2. 2
      lib/open_project/backlogs/engine.rb

@ -52,13 +52,7 @@ class IssueBoxesController < IssuesController
private private
def load_journals def load_journals
if Redmine::VERSION::MAJOR >= 2 @journals = @issue.journals.find(:all, :include => [:user], :order => "#{Journal.table_name}.created_at ASC")
@journals = @issue.journals.find(:all, :include => [:user], :order => "#{Journal.table_name}.created_at ASC") @journals.reverse! if User.current.wants_comments_in_reverse_order?
@journals.reverse! if User.current.wants_comments_in_reverse_order?
else
@journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
@journals.each_with_index {|j,i| j.indice = i+1}
@journals.reverse! if User.current.wants_comments_in_reverse_order?
end
end end
end end

@ -91,7 +91,7 @@ module OpenProject::Backlogs
version OpenProject::Backlogs::VERSION version OpenProject::Backlogs::VERSION
#requires_redmine_plugin 'chiliproject_nissue', '1.0.0' requires_openproject ">= 3.0.0beta1"
Redmine::AccessControl.permission(:edit_project).actions << "projects/project_issue_statuses" Redmine::AccessControl.permission(:edit_project).actions << "projects/project_issue_statuses"
Redmine::AccessControl.permission(:edit_project).actions << "projects/rebuild_positions" Redmine::AccessControl.permission(:edit_project).actions << "projects/rebuild_positions"

Loading…
Cancel
Save