add support redmine-3.0

diff --git a/app/controllers/quick_view_issues_controller.rb b/app/controllers/quick_view_issues_controller.rb
index 56543ee..0d28b35 100644 (file)
--- a/app/controllers/quick_view_issues_controller.rb
+++ b/app/controllers/quick_view_issues_controller.rb
@@ -3,6 +3,7 @@ class QuickViewIssuesController < ApplicationController
 
   def show
     @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
+    @relation = IssueRelation.new
 
     respond_to do |format|
       format.html {

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2a3186a..ef4cc3a 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,5 +1,8 @@
 #coding: utf-8
 
 module ApplicationHelper
+  def redmine_version
+    Redmine::VERSION::MAJOR * 10 + Redmine::VERSION::MINOR
+  end
 end
 

diff --git a/app/views/quick_view_issues/quick_view_issue_dialog.html.erb b/app/views/quick_view_issues/quick_view_issue_dialog.html.erb
index ae09f33..95906fb 100644 (file)
--- a/app/views/quick_view_issues/quick_view_issue_dialog.html.erb
+++ b/app/views/quick_view_issues/quick_view_issue_dialog.html.erb
@@ -14,6 +14,11 @@
   project = @issue.project
   changesets = issue.changesets.visible.all
   journals = issue.journals.includes(:user, :details).reorder("#{Journal.table_name}.id ASC").all
+  if redmine_version() >= 30
+    journals = journals.to_a
+  else
+    journals = journals.all
+  end
   journals.each_with_index {|j,i| j.indice = i+1}
   journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, project)
   journals.reverse! if User.current.wants_comments_in_reverse_order?
@@ -65,8 +70,7 @@
             end
           end
           if User.current.allowed_to?(:view_time_entries, project)
-            redmine_version = Redmine::VERSION::MAJOR * 10 + Redmine::VERSION::MINOR
-            if redmine_version < 26
+            if redmine_version() < 26
               rows.right l(:label_spent_time), (issue.total_spent_hours > 0 ? link_to(l_hours(issue.total_spent_hours), project_issue_time_entries_path(project, issue)) : "-"), :class => 'spent-time'
             else
               rows.right l(:label_spent_time), (issue.total_spent_hours > 0 ? link_to(l_hours(issue.total_spent_hours), issue_time_entries_path(issue)) : "-"), :class => 'spent-time'