Merge pull request #5 from evolvingweb/redmine-5-compatibility

Redmine 5 compatibility

app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb

@@ -1,18 +1,46 @@
-<% regex_find = '/\B'+Setting.plugin_redmine_mentions['trigger']+'(\w*)$/i'%>
+<% regex_find = '/\B'+'@'+'(\w*)$/i'%>
 <% if @project %>
   <% users = @project.users.to_a.delete_if{|u| (u.type != 'User' || u.mail.empty?)}%>
 <% else %>
   <% users = User.active.to_a.delete_if{|u| (u.type != 'User' || u.mail.empty?)}%>
 <% end %>
-<% users_regex = users.collect{|u| "#{Setting.plugin_redmine_mentions['trigger']}#{u.login}"}.join('|')%>
+<% users_regex = users.collect{|u| "#{'@'}#{u.login}"}.join('|')%>
 <% regex_highlight = '/\B('+users_regex+')\b/g' %>
+
+<% mapping = {} %>
+<%  journals = Journal.where("journalized_type = 'issue' AND journalized_id = :id", {id: @issue.id}) %>
+<%  journals.each do |journal| %>
+<%    details = JournalDetail.where("journal_id = :id", {id: journal.id}) %>
+<%    assignee = nil %>
+<%    status = nil %>
+<%    details.each do |detail| %>
+<%      if detail.prop_key == 'status_id' %>
+<%        status = detail.value %>
+<%      end %>
+<%      if detail.prop_key == 'assigned_to_id' %>
+<%        assignee = detail.value %>
+<%      end %>
+<%    end %>
+<%    if assignee && status %>
+<%      if !mapping.key?(assignee) %>
+<%        mapping[assignee] = [] %>
+<%      end %>
+<%      unless mapping[assignee].include? status %>
+<%        mapping[assignee].push(status) %>
+<%      end %>
+<%    end %>
+<%  end %>
+
+<% listing = {} %>
+<% IssueStatus.order("position").each { |status| listing[status.id] = "#{status.name}" } %>
+
 <script>
   var mentions = <%=  users.collect{|u| "#{u.id}-#{u.login}"}.to_json.html_safe %>;
   var id = 0;
   var user = '';
 
-  var usersMapping = <%= self.map_users_to_states(users, @issue) %>;
-  var statuses = <%= self.status_listing %>;
+  var usersMapping = <%= mapping.to_json.html_safe %>;
+  var statuses = <%= listing.to_json.html_safe %>;
 
   window.setInterval(function(){
     var text = $('#issue_notes').val();

init.rb

@@ -1,11 +1,12 @@
-require_dependency 'redmine_mentions_suggestions'
-
+Rails.configuration.to_prepare do
+  require_dependency 'redmine_mentions_suggestions'
+end
 Redmine::Plugin.register :redmine_mentions_suggestions do
   name 'Redmine Mentions Suggestions plugin'
   author 'Evolving Web'
   description 'Suggest assignee based on note text.'
-  version '0.0.1'
+  version '0.0.2'
   url 'https://github.com/evolvingweb/redmine_mentions_suggestions'
   author_url 'https://evolvingweb.ca'
 end
-
+

lib/redmine_mentions_suggestions.rb

@@ -1,5 +1,6 @@
 Rails.configuration.to_prepare do
 
-  IssuesController.send :helper, IssuesControllerHelper
   require_dependency 'redmine_mentions_suggestions/hooks'
 end
+module RedmineMentionsSuggestions
+end