[Rt-commit] rtir branch, master, updated. 3.3.0-166-gf794130

[Shawn Moore]

The branch, master has been updated
       via  f794130e5d1ae58c1025e87dcdfccc8e48629a88 (commit)
       via  f8a20b91b5e7fe8a27546bb4bc2cee9ca29387c4 (commit)
       via  022944d7ce64051eb6fcf2f0da383720d1c8f033 (commit)
       via  f444ed8ffc86ebf87afd496f7a52d400b79e95e2 (commit)
       via  b3471c6b16614916f8a9237e5aa072d0145a38b5 (commit)
       via  901dbe55b470bc25ab501046000819057067462e (commit)
       via  705ec0e83738825d0300527f69f1b1b21100b480 (commit)
       via  762d8b1567299f37cc728bf3a44790ea02caac1f (commit)
       via  4ed4bd853a0bb18316cc892f1e798fe5e0b1fa7e (commit)
       via  fcfe40d08a7f48f7c386faf09c2776bc9a156e4d (commit)
       via  e0a5f3061dafbdf866bee85a26854117cd419073 (commit)
       via  0f0ebabf4f53dbab061a96f380ab9f211707c90f (commit)
       via  0c7aba6c0e2bac674df4fb25f8432b6b7df8dddd (commit)
       via  5f72e5798aa3e6a028e84b8bd38a77387dbbc716 (commit)
       via  ebe8874d570c0ed1e34c86923d0863296c94bbf2 (commit)
      from  4667ce046340f4410c88905efe4c1509f59612e7 (commit)

Summary of changes:
 docs/UPGRADING-3.4                                 |   6 +
 html/Callbacks/RTIR/Elements/MakeClicky/Default    |   6 +-
 .../RTIR/Elements/RT__Ticket/ColumnMap/Once        |   4 +-
 html/Callbacks/RTIR/Elements/Tabs/Privileged       |  14 +-
 html/RTIR/Create.html                              |  12 +-
 .../Elements/Create => CreateInQueue.html}         |  23 +--
 .../{AddWatchers => CreateInRTIRQueueModal}        |  85 ++++++-----
 html/RTIR/Elements/ShowIncidents                   |   2 +-
 .../CreateInRTIRQueueModal}                        |   3 +-
 html/RTIR/Incident/Create.html                     | 100 ++-----------
 html/RTIR/Incident/Elements/ShowChildren           |   5 +-
 html/RTIR/Investigation/Elements/Create            |   9 +-
 html/RTIR/Tools/Elements/LookupSummary             |  11 +-
 lib/RT/Action/RTIR_ChangeChildConstituencies.pm    |  13 +-
 lib/RT/IR.pm                                       |   1 +
 lib/RT/IR/Test.pm.in                               |   4 +-
 lib/RT/IR/Test/Web.pm                              |  22 ++-
 static/js/rtir.js                                  |  69 +++++++++
 t/019-watchers-on-create.t                         |   4 +-
 t/020-incident-and-investigation.t                 |   5 +-
 t/articles/on-create.t                             |   4 +-
 t/constituency/basics.t                            |   8 +-
 t/constituency/modal.t                             | 163 +++++++++++++++++++++
 t/custom-fields/defaults-on-linking.t              |   1 +
 t/incident/split.t                                 |   3 +-
 25 files changed, 379 insertions(+), 198 deletions(-)
 copy html/RTIR/{Incident/Elements/Create => CreateInQueue.html} (80%)
 copy html/RTIR/Elements/{AddWatchers => CreateInRTIRQueueModal} (53%)
 copy html/RTIR/{Forward.html => Helpers/CreateInRTIRQueueModal} (96%)
 create mode 100644 static/js/rtir.js
 create mode 100644 t/constituency/modal.t

- Log -----------------------------------------------------------------
commit f8a20b91b5e7fe8a27546bb4bc2cee9ca29387c4
Merge: 4667ce0 022944d
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Wed May 25 23:16:20 2016 +0000

    Merge remote-tracking branch 'origin/3.4/popup-ticket-create'


commit f794130e5d1ae58c1025e87dcdfccc8e48629a88
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Wed May 25 23:19:13 2016 +0000

    Reconnect to database before unwinding upgrades
    
        Otherwise trying to clean up the blocks lifecycle issues queries
        that result in "MySQL server has gone away"

diff --git a/lib/RT/IR/Test.pm.in b/lib/RT/IR/Test.pm.in
index d88f479..8d83de9 100644
--- a/lib/RT/IR/Test.pm.in
+++ b/lib/RT/IR/Test.pm.in
@@ -167,6 +167,8 @@ sub apply_upgrade {
                 return ( $ret, $msg ) unless $ret;
             }
         }
+
+        RT::Test::__reconnect_rt();
     };
 
     foreach my $n ( 0..$#versions ) {
@@ -188,7 +190,7 @@ sub apply_upgrade {
 
     $upgrade->();
 
-    RT::Test::__reconnect_rt();
+    return 1;
 }
 
 sub get_admin_dbh {

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