#28 status change is now compatible with redmine_agile

CHANGELOG.rst

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+2.0.14
+++++++
+
+- Change status is now compatible with redmine_agile
+
+
 2.0.13
 ++++++
 

app/controllers/additionals_change_status_controller.rb

@@ -3,7 +3,7 @@ class AdditionalsChangeStatusController < ApplicationController
   helper :additionals_issues
 
   def update
-    issue_old_status = @issue.status.name
+    issue_old_status_id = @issue.status.id
     issue_old_user = @issue.assigned_to
     new_status_id = params[:new_status_id].to_i
     allowed_status = @issue.new_statuses_allowed_to(User.current)
@@ -17,7 +17,7 @@ class AdditionalsChangeStatusController < ApplicationController
     @issue.status_id = new_status_id
     @issue.assigned_to = User.current if @issue.status_x_affected?(new_status_id) && issue_old_user != User.current
 
-    if !@issue.save || issue_old_status == @issue.status.name
+    if !@issue.save || issue_old_status_id == @issue.status_id
       flash[:error] = l(:error_issue_status_could_not_changed)
       return redirect_to(issue_path(@issue))
     end
@@ -28,9 +28,9 @@ class AdditionalsChangeStatusController < ApplicationController
     last_journal = @issue.journals.visible.order('created_on').last
 
     JournalDetail.new(property: 'attr',
-                      prop_key: 'status',
-                      old_value: issue_old_status,
-                      value: @issue.status.name,
+                      prop_key: 'status_id',
+                      old_value: issue_old_status_id,
+                      value: @issue.status_id,
                       journal: new_journal).save!
 
     if @issue.assigned_to != issue_old_user

app/helpers/additionals_issues_helper.rb

@@ -1,6 +1,6 @@
 module AdditionalsIssuesHelper
   def issue_author_options_for_select(project, issue = nil)
-    authors = project.users.sort
+    authors = project.users.sorted
     s = []
     s << content_tag('option', "<< #{l(:label_me)} >>", value: User.current.id) if authors.include?(User.current)
 

init.rb

@@ -4,7 +4,7 @@ Redmine::Plugin.register :additionals do
   name 'Additionals'
   author 'AlphaNodes GmbH'
   description 'Customizing Redmine, providing wiki macros and act as a library/function provider for other Redmine plugins'
-  version '2.0.13'
+  version '2.0.14'
   author_url 'https://alphanodes.com/'
   url 'https://github.com/alphanodes/additionals'
 

lib/additionals/wiki_macros/member_macro.rb

@@ -44,7 +44,7 @@ module Additionals
 
           raw_users = User.active
                           .where(["#{User.table_name}.id IN (SELECT DISTINCT user_id FROM members WHERE project_id=(?))", project.id])
-                          .sort
+                          .sorted
           return '' if raw_users.nil?
 
           users = []
@@ -58,7 +58,7 @@ module Additionals
           # members of the user's projects
           users = User.active
                       .where(["#{User.table_name}.id IN (SELECT DISTINCT user_id FROM members WHERE project_id IN (?))", project_ids])
-                      .sort
+                      .sorted
         end
         render partial: 'wiki/user_macros', locals: { users: users,
                                                       user_roles: user_roles,