[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-200-g7e1a292

[Jesse Vincent]

The branch, 3.9-trunk has been updated
       via  7e1a292551581847c7cb30e2c665f3dd3335dd74 (commit)
       via  4f5ebaaf3e9de65645b6e98c9886909b06672874 (commit)
      from  8a71236d25192d8d865b4bf7241fc5a14de3cbe2 (commit)

Summary of changes:
 share/html/Admin/Global/Scrips.html    |    2 +-
 share/html/Admin/Global/Templates.html |    2 +-
 share/html/Admin/Groups/Members.html   |    7 +++++--
 share/html/Admin/Queues/Scrips.html    |    4 ++--
 share/html/Admin/Queues/Templates.html |    4 ++--
 t/ticket/scrips_batch.t                |    2 +-
 6 files changed, 12 insertions(+), 9 deletions(-)

- Log -----------------------------------------------------------------
commit 4f5ebaaf3e9de65645b6e98c9886909b06672874
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Mon Aug 2 11:38:54 2010 -0700

    Clean up an old Title attribute that should have been fixed years ago

diff --git a/share/html/Admin/Groups/Members.html b/share/html/Admin/Groups/Members.html
index c7e753a..bc68856 100755
--- a/share/html/Admin/Groups/Members.html
+++ b/share/html/Admin/Groups/Members.html
@@ -45,10 +45,10 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => loc('RT/Admin/Edit the group [_1]', $Group->Name) &>
+<& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/GroupTabs, GroupObj => $Group, 
     current_tab => 'Admin/Groups/Members.html?id='.$id, 
-    Title => "RT/Admin/Edit the group ". $Group->Name &>
+    Title => $title &>
 <& /Elements/ListActions, actions => \@results &>
 
 <form action="<% RT->Config->Get('WebPath') %>/Admin/Groups/Members.html" method="post">
@@ -116,6 +116,8 @@ my @users = sort { lc($a->[0]) cmp lc($b->[0]) }
 my $Group = new RT::Group($session{'CurrentUser'});
 $Group->Load($id) || Abort(loc('Could not load group'));
 
+my $title = loc("Modify the group [_1]", $Group->Name);
+
 my (%UsersSeen, %GroupsSeen);
 $GroupsSeen{ $Group->id } = 1; # can't be a member of ourself
 
@@ -148,6 +150,7 @@ foreach my $member (grep $_, @AddMembersUsers, @AddMembersGroups) {
     push (@results, $msg);
 }
 
+
 </%INIT>
 
 <%ARGS>

commit 7e1a292551581847c7cb30e2c665f3dd3335dd74
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Mon Aug 2 11:42:36 2010 -0700

    Clean up a bunch of Select/Create menu items that didn't match the
    pattern

diff --git a/share/html/Admin/Global/Scrips.html b/share/html/Admin/Global/Scrips.html
index 9a5d55a..28c3349 100755
--- a/share/html/Admin/Global/Scrips.html
+++ b/share/html/Admin/Global/Scrips.html
@@ -59,7 +59,7 @@ my $subtabs = {
 		 A => { title => loc('Select'),
   		     	path => "Admin/Global/Scrips.html",
 			   },
-		 B => { title => loc('New'),
+		 B => { title => loc('Create'),
   		     	path => "Admin/Global/Scrip.html?create=1&Queue=0",
 			separator => 1,
 			   }
diff --git a/share/html/Admin/Global/Templates.html b/share/html/Admin/Global/Templates.html
index cb36dba..70a847c 100755
--- a/share/html/Admin/Global/Templates.html
+++ b/share/html/Admin/Global/Templates.html
@@ -59,7 +59,7 @@ my $subtabs = {
 		 A => { title => loc('Select'),
   		     	path => "Admin/Global/Templates.html"
 			   },
-		 B => { title => loc('New'),
+		 B => { title => loc('Create'),
   		     	path => "Admin/Global/Template.html?Create=1&Queue=0",
 			separator => 1,
 			   }
diff --git a/share/html/Admin/Queues/Scrips.html b/share/html/Admin/Queues/Scrips.html
index 4131057..fa5956d 100755
--- a/share/html/Admin/Queues/Scrips.html
+++ b/share/html/Admin/Queues/Scrips.html
@@ -72,10 +72,10 @@ if ($QueueObj->id) {
 }
 
 my $subtabs = {
-	 A => { title => loc('Select scrip'),
+	 A => { title => loc('Select'),
 	     	path => "Admin/Queues/Scrips.html?id=".$id,
 			   },
-	 B => { title => loc('New scrip'),
+	 B => { title => loc('Create'),
 	     	path => "Admin/Queues/Scrip.html?create=1&Queue=".$id,
             separator => 1,
 			   }
diff --git a/share/html/Admin/Queues/Templates.html b/share/html/Admin/Queues/Templates.html
index bd63404..066a00e 100755
--- a/share/html/Admin/Queues/Templates.html
+++ b/share/html/Admin/Queues/Templates.html
@@ -67,10 +67,10 @@ if ($QueueObj->id) {
     Abort(loc("Queue [_1] not found",$id));
 }
 my $subtabs = {
-	 A => { title => loc('Select template'),
+	 A => { title => loc('Select'),
 	     	path => "Admin/Queues/Templates.html?id=".$id,
 		   },
-	 B => { title => loc('New template'),
+	 B => { title => loc('Create'),
 	     	path => "Admin/Queues/Template.html?Create=1&Queue=".$id,
 		   }
 	      };
diff --git a/t/ticket/scrips_batch.t b/t/ticket/scrips_batch.t
index f558d3b..9e733be 100644
--- a/t/ticket/scrips_batch.t
+++ b/t/ticket/scrips_batch.t
@@ -20,7 +20,7 @@ my $sid;
     $m->follow_link_ok( { text => 'Queues' } );
     $m->follow_link_ok( { text => $queue->Name } );
     $m->follow_link_ok( { text => 'Scrips' } );
-    $m->follow_link_ok( { text => 'New scrip' } );
+    $m->follow_link_ok( { url_regex => qr'Scrip.html\?create=1' } );
     $m->form_number(3);
     $m->field('Scrip-new-Description' => 'test');
     $m->select('Scrip-new-ScripCondition' => 'On Transaction');

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