[Rt-commit] rt branch, 4.2/template-name-instead-of-id, updated. rt-4.0.8-579-g60fe90f

[Alex Vandiver]

The branch, 4.2/template-name-instead-of-id has been updated
       via  60fe90f908911ed2b3ef00de04e8fbdd4c3ba1e7 (commit)
       via  d97642acab65152768f287594c791e17cac37d5c (commit)
       via  3f34d45fe1e7a830155ced1514e8937261b032f5 (commit)
      from  ff986605190c4600c1d5c247540d3359f1e6e12c (commit)

Summary of changes:
 etc/upgrade/{4.1.3 => 4.1.5}/content       | 0
 etc/upgrade/{4.1.3 => 4.1.5}/schema.Oracle | 0
 etc/upgrade/{4.1.3 => 4.1.5}/schema.Pg     | 0
 etc/upgrade/{4.1.3 => 4.1.5}/schema.mysql  | 0
 lib/RT/Template.pm                         | 6 +++---
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename etc/upgrade/{4.1.3 => 4.1.5}/content (100%)
 rename etc/upgrade/{4.1.3 => 4.1.5}/schema.Oracle (100%)
 rename etc/upgrade/{4.1.3 => 4.1.5}/schema.Pg (100%)
 rename etc/upgrade/{4.1.3 => 4.1.5}/schema.mysql (100%)

- Log -----------------------------------------------------------------
commit 3f34d45fe1e7a830155ced1514e8937261b032f5
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Nov 30 18:16:29 2012 -0500

    Upgrade for 4.1.3 has already been merged; renumber to 4.1.5

diff --git a/etc/upgrade/4.1.3/content b/etc/upgrade/4.1.5/content
similarity index 100%
rename from etc/upgrade/4.1.3/content
rename to etc/upgrade/4.1.5/content
diff --git a/etc/upgrade/4.1.3/schema.Oracle b/etc/upgrade/4.1.5/schema.Oracle
similarity index 100%
rename from etc/upgrade/4.1.3/schema.Oracle
rename to etc/upgrade/4.1.5/schema.Oracle
diff --git a/etc/upgrade/4.1.3/schema.Pg b/etc/upgrade/4.1.5/schema.Pg
similarity index 100%
rename from etc/upgrade/4.1.3/schema.Pg
rename to etc/upgrade/4.1.5/schema.Pg
diff --git a/etc/upgrade/4.1.3/schema.mysql b/etc/upgrade/4.1.5/schema.mysql
similarity index 100%
rename from etc/upgrade/4.1.3/schema.mysql
rename to etc/upgrade/4.1.5/schema.mysql

commit d97642acab65152768f287594c791e17cac37d5c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Nov 30 18:29:47 2012 -0500

    Warnings avoidance, if LoadByName is called without a Queue

diff --git a/lib/RT/Template.pm b/lib/RT/Template.pm
index cb0012e..92c5246 100644
--- a/lib/RT/Template.pm
+++ b/lib/RT/Template.pm
@@ -185,7 +185,7 @@ sub LoadByName {
     my $queue = $args{'Queue'};
     if ( blessed $queue ) {
         $queue = $queue->id;
-    } elsif ( $queue =~ /\D/ ) {
+    } elsif ( defined $queue and $queue =~ /\D/ ) {
         my $tmp = RT::Queue->new( $self->CurrentUser );
         $tmp->Load($queue);
         $queue = $tmp->id;

commit 60fe90f908911ed2b3ef00de04e8fbdd4c3ba1e7
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Dec 3 12:26:57 2012 -0500

    Adjust locstring for grammar

diff --git a/lib/RT/Template.pm b/lib/RT/Template.pm
index 92c5246..1e17715 100644
--- a/lib/RT/Template.pm
+++ b/lib/RT/Template.pm
@@ -282,7 +282,7 @@ sub Create {
     {
         my $tmp = $self->new( RT->SystemUser );
         $tmp->LoadByCols( Name => $args{'Name'}, Queue => $args{'Queue'} );
-        return ( undef, $self->loc('Template with that name already exist') )
+        return ( undef, $self->loc('A Template with that name already exists') )
             if $tmp->id;
     }
 
@@ -700,7 +700,7 @@ sub SetName {
 
     my $tmp = $self->new( RT->SystemUser );
     $tmp->LoadByCols( Name => $value, Queue => $self->Queue );
-    return ( undef, $self->loc('Template with that name already exist') )
+    return ( undef, $self->loc('A Template with that name already exists') )
         if $tmp->id;
 
     return $self->_Set( Field => 'Name', Value => $value );

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