[Rt-commit] rt branch, master, updated. rt-4.0.8-682-gb79c06b

[Alex Vandiver]

The branch, master has been updated
       via  b79c06b7a9008f6282ff07dcc8b612b83aaf94fc (commit)
       via  60fe90f908911ed2b3ef00de04e8fbdd4c3ba1e7 (commit)
       via  d97642acab65152768f287594c791e17cac37d5c (commit)
       via  3f34d45fe1e7a830155ced1514e8937261b032f5 (commit)
       via  ff986605190c4600c1d5c247540d3359f1e6e12c (commit)
       via  6b3c57a872772da61a27dcfb1d726af9ea52a0fd (commit)
       via  bddbca3dbae4807d4823ccdc9a56fc530c83f55d (commit)
       via  c8ec075e585457961eea998cb15ee6dadab4592f (commit)
       via  7c99e1498ca6d6cf036e2d13cdb5f6ada069cb50 (commit)
       via  6600ee55be500f6b2fb2eb6967d180d7171a109f (commit)
       via  ba08e130c55639317d2845c8d3fb121f61e6bb9b (commit)
       via  c49a22afb38f514a3fac1c6a35fc689e390d48a2 (commit)
       via  51991fe0674c236f42d00311e253838a3c0c886c (commit)
       via  89fbe2b911c44ac99a440bddf86708dddfd691fb (commit)
       via  97990d8b464194ececf76eb064aca2b1d43195e0 (commit)
       via  583215493a2700232ecd3a39ecb1d356cc018600 (commit)
       via  fe59c145a541dd45eb304251ac0bfcecdde5d441 (commit)
       via  373ae8264f3bede0f562e22a6ab094e3d872ca95 (commit)
       via  f11867ee25890dd2f620682ba6c3eac5109d8f5b (commit)
       via  77109237f2c3779e2d280f920e2c5da8a518a20b (commit)
       via  b32bdda83cb98a1505146d870da1fbbf04135515 (commit)
       via  c683c7132e2a416955a4481aca0b2d74704ae234 (commit)
       via  574a97a5940ee3a12c4fd7b4c1c145316edc59ad (commit)
       via  23ce40d17bc7bb111402f42948f49ab1375c0c6f (commit)
       via  b98cf3794172c7673d40ff122e6e79c4915283ed (commit)
       via  2544c3a6f6512c7807167b023ecb06e9e1301682 (commit)
       via  8bd0d450f114d54ddea1b3ba4fc184071d40f2a9 (commit)
       via  ba7e62a0c607f9c38c0ab2face42706e171edeb8 (commit)
       via  02ee1050e128859823b577748a09d508cc324a7a (commit)
       via  bdec3fdb036791f3966ecd737de1ef7ba8c52a06 (commit)
       via  4868d569ec1932fdc8c4fef379ef499cfc60151e (commit)
       via  444e888978a8b57de8521a27d6d4d5576251c869 (commit)
      from  9206ca18ea93522ccb6418b05f8ab8364ccd00a9 (commit)

Summary of changes:
 etc/RT_Config.pm.in                             |   2 +-
 etc/schema.Oracle                               |   2 +-
 etc/schema.Pg                                   |   2 +-
 etc/schema.SQLite                               |   2 +-
 etc/schema.mysql                                |   2 +-
 etc/upgrade/4.1.5/content                       |  34 ++++
 etc/upgrade/4.1.5/schema.Oracle                 |   5 +
 etc/upgrade/4.1.5/schema.Pg                     |   2 +
 etc/upgrade/4.1.5/schema.mysql                  |   2 +
 lib/RT/Action.pm                                |  20 ---
 lib/RT/Rule.pm                                  |   3 +-
 lib/RT/Scrip.pm                                 |  66 ++++----
 lib/RT/ScripAction.pm                           | 201 ++++++++----------------
 lib/RT/ScripCondition.pm                        |  17 --
 lib/RT/Scrips.pm                                |  79 ++++++++++
 lib/RT/Shredder/Plugin/Summary.pm               |   2 +-
 lib/RT/Shredder/Template.pm                     |   4 +-
 lib/RT/Template.pm                              | 110 +++++++++++--
 sbin/rt-validator.in                            |   2 +-
 share/html/Admin/Scrips/Elements/SelectTemplate |  57 ++++---
 share/html/Admin/Scrips/Objects.html            |  10 ++
 share/html/Elements/RT__Scrip/ColumnMap         |   4 +-
 share/html/Elements/RT__Template/ColumnMap      |  18 +++
 share/html/Ticket/Elements/PreviewScrips        |   2 +-
 t/api/scrip.t                                   |  59 ++++++-
 t/api/template.t                                | 127 ++++++++++++++-
 t/web/scrips.t                                  | 107 +++++++++++--
 27 files changed, 665 insertions(+), 276 deletions(-)
 create mode 100644 etc/upgrade/4.1.5/content
 create mode 100644 etc/upgrade/4.1.5/schema.Oracle
 create mode 100644 etc/upgrade/4.1.5/schema.Pg
 create mode 100644 etc/upgrade/4.1.5/schema.mysql

- Log -----------------------------------------------------------------
commit b79c06b7a9008f6282ff07dcc8b612b83aaf94fc
Merge: 9206ca1 60fe90f
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Dec 3 14:34:57 2012 -0500

    Merge branch '4.2/template-name-instead-of-id'
    
    Conflicts:
    	sbin/rt-validator.in

diff --cc sbin/rt-validator.in
index 6dc7f81,15fce50..e358a32
--- a/sbin/rt-validator.in
+++ b/sbin/rt-validator.in
@@@ -802,23 -782,21 +802,23 @@@ push @CHECKS, Templates => sub 
  };
  
  push @CHECKS, Scrips => sub {
 -    check_integrity(
 +    my $res = 1;
 +    $res *= check_integrity(
          'Scrips', 'ScripCondition' => 'ScripConditions', 'id',
      );
 -    check_integrity(
 +    $res *= check_integrity(
          'Scrips', 'ScripAction' => 'ScripActions', 'id',
      );
 -    check_integrity(
 +    $res *= check_integrity(
-         'Scrips', 'Template' => 'Templates', 'id',
+         'Scrips', 'Template' => 'Templates', 'Name',
      );
 -    check_integrity(
 +    $res *= check_integrity(
          'ObjectScrips', 'Scrip' => 'Scrips', 'id',
      );
 -    check_integrity(
 +    $res *= check_integrity(
          'ObjectScrips', 'ObjectId' => 'Queues', 'id',
      );
 +    return $res;
  };
  
  push @CHECKS, Attributes => sub {

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