[Rt-commit] rtir branch, 4.0.1-releng, updated. 4.0.1rc1-8-gc4824f9

[Jim Brandt]

The branch, 4.0.1-releng has been updated
       via  c4824f9b2da88a3df4f32c9aa35e73a1be9c25c1 (commit)
      from  c83c3389547172091aa8977c9b7db0463dfe26ca (commit)

Summary of changes:
 etc/upgrade/2.9.0/content | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit c4824f9b2da88a3df4f32c9aa35e73a1be9c25c1
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Mon Nov 6 14:09:59 2017 -0500

    Restrict to enabled states when updating status during upgrade
    
    Older versions of RTIR disabled previous state values when a new state
    was set, leaving the previous values in the OCFV table. 8f84f3d40
    didn't exclude disabled state values, allowing upgraded tickets
    to possible get set to an older, incorrect state. Restrict
    the update to the value with Disabled != 1 to set the status
    correctly.

diff --git a/etc/upgrade/2.9.0/content b/etc/upgrade/2.9.0/content
index 226bbe6..d46a6c3 100644
--- a/etc/upgrade/2.9.0/content
+++ b/etc/upgrade/2.9.0/content
@@ -169,7 +169,8 @@ our @Final = (
                 . " where Tickets.Queue = " . $queue->Id
                 . " and ObjectCustomFieldValues.ObjectId = Tickets.id and"
                 . " ObjectCustomFieldValues.CustomField = " . $cf->Id
-                . " and ObjectCustomFieldValues.Content = '$state'";
+                . " and ObjectCustomFieldValues.Content = '$state'"
+                . " and ObjectCustomFieldValues.Disabled != 1";
 
                 my $res = $RT::Handle->SimpleUpdateFromSelect(
                     'Tickets', { Status => $state }, $ticket_select

-----------------------------------------------------------------------