fixes for redmine 3 compatibility

planio-gmbh · Jul 22, 2016 · 4d486db · 4d486db
1 parent c785328
commit 4d486db
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/app/views/hooks/redmine_mentions/_edit_mentionable.html.erb b/app/views/hooks/redmine_mentions/_edit_mentionable.html.erb
@@ -4,7 +4,7 @@
 <% regex_find = '/\B'+Setting.plugin_redmine_mentions['trigger']+'(\w*)$/i'%>
 
 
-<%users= @project.users.delete_if{|u| (u.type != 'User' || u.mail.empty?)}%>
+<%users= (@project && @project.users.to_a.delete_if{|u| (u.type != 'User' || u.mail.empty?)}) || []%>
 <%users_regex=users.collect{|u| "#{Setting.plugin_redmine_mentions['trigger']}#{u.login}"}.join('|')%>
 <% regex_highlight = '/\B('+users_regex+')/g' %>
 <script>
@@ -32,4 +32,4 @@
       }
     }
   ]);
-</script>
+</script>
diff --git a/init.rb b/init.rb
diff --git a/lib/redmine_mentions/journal_patch.rb b/lib/redmine_mentions/journal_patch.rb
@@ -8,7 +8,7 @@ def send_mail
           if self.journalized.is_a?(Issue) && self.notes.present?
             issue = self.journalized
             project=self.journalized.project
-            users=project.users.delete_if{|u| (u.type != 'User' || u.mail.empty?)}
+            users=project.users.to_a.delete_if{|u| (u.type != 'User' || u.mail.empty?)}
             users_regex=users.collect{|u| "#{Setting.plugin_redmine_mentions['trigger']}#{u.login}"}.join('|')
             regex_for_email = '\B('+users_regex+')'
             regex = Regexp.new(regex_for_email)
@@ -24,4 +24,4 @@ def send_mail
       end
     end
   end
-end
+end