diff --git a/app/controllers/issue_boxes_controller.rb b/app/controllers/issue_boxes_controller.rb index 39cdc01f00..56886eb444 100644 --- a/app/controllers/issue_boxes_controller.rb +++ b/app/controllers/issue_boxes_controller.rb @@ -52,13 +52,7 @@ class IssueBoxesController < IssuesController private def load_journals - if Redmine::VERSION::MAJOR >= 2 - @journals = @issue.journals.find(:all, :include => [:user], :order => "#{Journal.table_name}.created_at ASC") - @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 + @journals = @issue.journals.find(:all, :include => [:user], :order => "#{Journal.table_name}.created_at ASC") + @journals.reverse! if User.current.wants_comments_in_reverse_order? end end diff --git a/lib/open_project/backlogs/engine.rb b/lib/open_project/backlogs/engine.rb index 532192a688..2eed03233f 100644 --- a/lib/open_project/backlogs/engine.rb +++ b/lib/open_project/backlogs/engine.rb @@ -91,7 +91,7 @@ module OpenProject::Backlogs 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/rebuild_positions"