[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.3-16-g5e09a40

Alex Vandiver alexmv at bestpractical.com
Tue Nov 8 14:08:24 EST 2011


The branch, 4.0-trunk has been updated
       via  5e09a401865def6dd4baa862da3a8dafb166c1d6 (commit)
       via  1b7ef35efdde704bd3ce6932191aa6506ef77eb1 (commit)
       via  c9e546bedbffa4c1fe7361197f5c217b2c211940 (commit)
       via  067b9cebd3af77ead0a3f2fcbe459d212c6fe8d7 (commit)
       via  9c7fd03788cbf21ecfd5152bb8a7e9f8cc74387e (commit)
       via  d95a6037e895911042eccaee1d36e1fa79186d74 (commit)
       via  4701ed2597c480452da3057f3be4e970a54eeb6c (commit)
       via  50fba6a338b99ee76b71f179b3e01df267c4120d (commit)
       via  3a94e5dc8eec4305a6388c26d800782bc84394b5 (commit)
       via  61cd12e0ec9e34cc4fe8850d50fe087f5495327c (commit)
       via  476221031729f2f2ac0f732676e0c7d55425a13c (commit)
       via  b5ad69ceaec48af9c29f1a6982f6d58cbe5e0071 (commit)
       via  02788a2b478401e21f01976cffeda6bb486a1da2 (commit)
       via  d6e02727428b730852667171cc8f0b27f3e648fd (commit)
       via  262c0978067aad4635f1243dc6e0ca9bdf751e91 (commit)
       via  1e6966bd54244920f0d883d3c004f01a1aebe725 (commit)
       via  7f311a70edf1e3a96e48443045881e76679cde9c (commit)
       via  fec53dc804934e5742b4434e90c1e7ec92811d42 (commit)
       via  1007d2e6db3e231e05c40fec261eafabd95b2559 (commit)
       via  74bb29ade4fe25e1e203c34519c139176f9dfa04 (commit)
       via  25cda07bc7bbbcef2b8fdd0a7bd2ce3b3fbbe6d0 (commit)
       via  c3f3a6bf87213f7974fac61a0d3584ff02378237 (commit)
       via  f99c4e8c34120cca5ae789d4cb823bba4cf8b437 (commit)
       via  ad86cadbbb61d3eb94340f2fc5a6e8e8e1aed73e (commit)
       via  acf143f42f033efe051d5449c41785372ae26491 (commit)
       via  9ae510476fe1e6b8fac2ef1fd61f2ce2db38b8e2 (commit)
       via  c46a193c22db6f5fd86ea578961ab69e7948eba8 (commit)
       via  72e027a58a4538226ecdbd26b9b7dc81da44944b (commit)
       via  77a25da590f4f9d56eb4c62913bb238decaa5587 (commit)
       via  b756f5bfdfeecc415fb636df40cac916ccf92148 (commit)
       via  9702bf5b50cdf14b5280f2dc815a2646e4d899dd (commit)
       via  02b10b3cb9f3294e9443e42dfda821819315dff1 (commit)
       via  3572d91bacc2f0170f4e215d2265e9684b96d9f6 (commit)
       via  4adf2a4f271d7e156c50701b1df03567b4b07318 (commit)
       via  ad707b96c55450504e039a3bebde515e3e3275a9 (commit)
       via  36022c7226d32a776bf743e9858c35dc98d04ae6 (commit)
       via  5771f7722b1a1287a4e6050f83cf0dedd7c42a7e (commit)
       via  961506950c0ad9dbd1a4ad9ed42aa2178f8452c5 (commit)
       via  a7934415b3bc4a4b575e10d5ff4465b6c01fab2a (commit)
       via  afc0decab3107c68b26f1ab654c0da38b9f938f0 (commit)
       via  2941294fa8587b5ec1da6d86d372b8ab8928110a (commit)
       via  19098bb4db72efa9f1c9553804ade215191330c5 (commit)
       via  771a9575a29d27d9f24be751b6dd2b0fab47a760 (commit)
       via  64cbe99671df3c5e72c1aa2948c3c2f0649375af (commit)
       via  1e885f2bc2f5b54fa1f53c06bf01fe0578dba2ec (commit)
       via  153361e72819b5fd2eca66b1d6e9a23314c68a83 (commit)
       via  8e269a407fb945c01478ad25546549727f512f8d (commit)
       via  695b1ae83c1018ecf6711af59d64d8d11a9800b7 (commit)
       via  dee4d21c7bbd8aead13f52000c675907fb261071 (commit)
       via  62ca47c19850642e235ce401856c1c61bd2d6992 (commit)
       via  178433c674c8f02c5c7f6f2db6002de4dc8a1897 (commit)
       via  f35c8968372fa58f028ed5c5b1ee2cf33244547a (commit)
       via  88051a9008c3350683156355ef9454aa5136cd7e (commit)
       via  1d6bfed3ad9e2e33a5af38e70cc067b169d01500 (commit)
       via  f8795ee0e1b470826f6092c13d9000dc3895b065 (commit)
       via  9d36c097d7cddbd983713591451b2464dbdd720f (commit)
       via  93d452ac5739cc2d7daa9f705d73fb770c6eeb83 (commit)
       via  baa5e21719adb55d7edcbab559f0eb8e1339a185 (commit)
       via  358b9c431d85acced23ae08ec3b07e583edf45d3 (commit)
       via  143c21c27c51dcc5982d6a09611913ebf314ce5e (commit)
       via  daf95c016a59f7554e6a208f25392d76f7c791e3 (commit)
       via  b2b90c6a8e4a745f3515578318141106f8db4073 (commit)
       via  a0e17a18ad6263dbb63aa56678ad0bfb847c7ab0 (commit)
       via  c53b164d6fb5cebe24d23b22e52de9ee05b7ead2 (commit)
       via  04378a44db8be6cdd421a6b5dfc835b6ca93ec4c (commit)
       via  459ad08b8e718382fb01c666e391aa284037856b (commit)
      from  9609086fc31fd825c44fbcb1507c8f042fdd34bd (commit)

Summary of changes:
 docs/UPGRADING-3.6                                 |    2 +-
 docs/web_deployment.pod                            |    2 +-
 etc/RT_Config.pm.in                                |    5 +-
 etc/upgrade/3.9.1/content                          |    6 +-
 .../upgrade/sanity-check-stylesheets.pl            |   69 ++++++---------
 lib/RT.pm                                          |   31 ++++---
 lib/RT/Action/CreateTickets.pm                     |    2 +-
 lib/RT/Action/SendEmail.pm                         |   13 ++--
 lib/RT/Class.pm                                    |    2 +-
 lib/RT/Config.pm                                   |   16 ++++
 lib/RT/Crypt/GnuPG.pm                              |    3 +-
 lib/RT/CustomField.pm                              |   42 ++++++---
 lib/RT/CustomFieldValues/External.pm               |    2 +-
 lib/RT/Group.pm                                    |    5 +-
 lib/RT/Handle.pm                                   |   10 ++-
 lib/RT/Interface/Web.pm                            |   21 +++++-
 lib/RT/Interface/Web/Handler.pm                    |    6 +-
 lib/RT/Interface/Web/Request.pm                    |    6 +-
 lib/RT/Queue.pm                                    |   29 +++++--
 lib/RT/Record.pm                                   |    4 +-
 lib/RT/Scrips.pm                                   |   64 +++++++++++++-
 lib/RT/Transaction.pm                              |    5 +-
 lib/RT/User.pm                                     |   24 +++++
 share/html/Admin/Articles/Classes/Modify.html      |    2 +-
 share/html/Admin/Groups/Modify.html                |    2 +-
 share/html/Admin/Queues/Modify.html                |   16 ++--
 share/html/Admin/Tools/Configuration.html          |    2 +-
 share/html/Articles/Elements/IncludeArticle        |    2 +
 share/html/Elements/ColumnMap                      |    2 +-
 share/html/Elements/Header                         |    8 +-
 share/html/Elements/MakeClicky                     |    2 +-
 share/html/REST/1.0/logout                         |    2 +-
 share/html/Ticket/Elements/ShowMessageStanza       |   48 +++++++++-
 share/html/Ticket/ModifyAll.html                   |    9 ++-
 share/html/Widgets/Form/Boolean                    |    2 +-
 share/html/Widgets/Form/Integer                    |    2 +-
 share/html/Widgets/Form/Select                     |    2 +-
 share/html/Widgets/Form/String                     |    2 +-
 t/00-mason-syntax.t                                |    2 +-
 t/mail/threading.t                                 |   90 ++++++++++++++++++++
 t/web/cf_access.t                                  |   68 +++++++++++++++-
 t/web/class_create.t                               |   75 ++++++++++++++++
 t/web/group_create.t                               |   75 ++++++++++++++++
 t/web/queue_create.t                               |   75 ++++++++++++++++
 t/web/ticket_modify_all.t                          |   17 ++++-
 t/web/transaction_batch.t                          |   52 +++++++++++
 46 files changed, 783 insertions(+), 143 deletions(-)
 copy lib/RT/Classes.pm => etc/upgrade/sanity-check-stylesheets.pl (67%)
 create mode 100644 t/mail/threading.t
 create mode 100644 t/web/class_create.t
 create mode 100644 t/web/group_create.t
 create mode 100644 t/web/queue_create.t
 create mode 100644 t/web/transaction_batch.t

- Log -----------------------------------------------------------------
commit 5e09a401865def6dd4baa862da3a8dafb166c1d6
Merge: 9609086 1b7ef35
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Nov 8 13:26:14 2011 -0500

    Merge branch '4.0.3-releng' into 4.0-trunk
    
    Conflicts:
    	lib/RT/Queue.pm

diff --cc lib/RT/Queue.pm
index 5f525d0,1a4f85c..9ff2f9e
--- a/lib/RT/Queue.pm
+++ b/lib/RT/Queue.pm
@@@ -405,8 -405,11 +405,8 @@@ sub Create 
      }
  
      {
-         my ($val, $msg) = $self->ValidateName( $args{'Name'} );
+         my ($val, $msg) = $self->_ValidateName( $args{'Name'} );
 -
 -        if (!$val) {
 -            return ($val, $self->loc($msg));
 -        }
 +        return ($val, $msg) unless $val;
      }
  
      if ( $args{'Lifecycle'} && $args{'Lifecycle'} ne 'default' ) {
@@@ -535,22 -538,33 +535,33 @@@ sub ValidateName 
      my $self = shift;
      my $name = shift;
  
+     my ($ok, $msg) = $self->_ValidateName($name);
+ 
+     return $ok ? 1 : 0;
+ }
+ 
+ sub _ValidateName {
+     my $self = shift;
+     my $name = shift;
+ 
+     return (undef, "Queue name is required") unless length $name;
+ 
+     # Validate via the superclass first
+     # Case: short circuit if it's an integer so we don't have
+     # fale negatives when loading a temp queue
+     unless ( my $q = $self->SUPER::ValidateName($name) ) {
 -        return ($q, "That's not a valid name.");
++        return ($q, $self->loc("'[_1]' is not a valid name.", $name));
+     }
+ 
      my $tempqueue = RT::Queue->new(RT->SystemUser);
      $tempqueue->Load($name);
  
      #If this queue exists, return undef
      if ( $tempqueue->Name() && $tempqueue->id != $self->id)  {
 -        return (undef, "Queue already exists.");
 +        return (undef, $self->loc("Queue already exists") );
      }
  
-     #If the queue doesn't exist, return 1
-     elsif (my $q = $self->SUPER::ValidateName($name)) {
-         return ($q);
-     }
-     else {
-         return (undef, $self->loc("'[_1]' is not a valid name.", $name) );
-     }
- 
+     return (1);
  }
  
  

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


More information about the Rt-commit mailing list