[Rt-commit] r2467 - in rt/branches/QUEBEC-EXPERIMENTAL: etc html/Elements lib/t/regression

[clkao at bestpractical.com]

Author: clkao
Date: Mon Mar 14 11:48:37 2005
New Revision: 2467

Modified:
   rt/branches/QUEBEC-EXPERIMENTAL/etc/initialdata
   rt/branches/QUEBEC-EXPERIMENTAL/html/Elements/ShowSearch
   rt/branches/QUEBEC-EXPERIMENTAL/lib/t/regression/18custom_frontpage.t
Log:
* Rename "My Requests" => "Unowned Tickets".
* __l{text}__ => __loc(text)__

Modified: rt/branches/QUEBEC-EXPERIMENTAL/etc/initialdata
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/etc/initialdata	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/etc/initialdata	Mon Mar 14 11:48:37 2005
@@ -597,11 +597,11 @@
         OrderBy => 'Priority',
         Order   => 'DESC' },
     },
-    { Name => 'Search - My Requests',
+    { Name => 'Search - Unowned Tickets',
       Description => '[_1] newest unowned tickets', # loc
       Content     =>
 # 'Take' #loc
-      { Format => "'<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__id__</a>/TITLE:#', '<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__Subject__</a>/TITLE:Subject', QueueName, ExtendedStatus, CreatedRelative, '<A HREF=\"__WebPath__/Ticket/Display.html?Action=Take&id=__id__\">__l{Take}__</a>/TITLE:&nbsp;' ",
+      { Format => "'<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__id__</a>/TITLE:#', '<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__Subject__</a>/TITLE:Subject', QueueName, ExtendedStatus, CreatedRelative, '<A HREF=\"__WebPath__/Ticket/Display.html?Action=Take&id=__id__\">__loc(Take)__</a>/TITLE:&nbsp;' ",
         Query   => " Owner = 'Nobody' AND ( Status = 'new' OR Status = 'open')",
         OrderBy => 'Created',
         Order   => 'DESC' },
@@ -611,7 +611,7 @@
       Content =>
       { 'body' => # loc
 	[ { type => 'system', name => 'My Tickets' },
-	  { type => 'system', name => 'My Requests' },
+	  { type => 'system', name => 'Unowned Tickets' },
 	  { type => 'component',  name => 'QuickCreate'},
 	],
         'summary' => # loc

Modified: rt/branches/QUEBEC-EXPERIMENTAL/html/Elements/ShowSearch
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/html/Elements/ShowSearch	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/html/Elements/ShowSearch	Mon Mar 14 11:48:37 2005
@@ -83,7 +83,7 @@
 my $rows = $user->Preferences('SummaryRows', $RT::DefaultSummaryRows);
 $SearchArg->{'Query'} =~ s/__CurrentUser__/$session{'CurrentUser'}->Id/ge;
 $SearchArg->{'Format'} =~ s/__WebPath__/$RT::WebPath/g;
-$SearchArg->{'Format'} =~ s/__l\{(\w+)\}__/loc("$1")/ge;
+$SearchArg->{'Format'} =~ s/__loc\(["']?(\w+)["']?\)__/loc("$1")/ge;
 my $QueryString = '?' . $m->comp('/Elements/QueryString',
 	    map { $_ => $SearchArg->{$_} } qw(Query Order OrderBy));
 

Modified: rt/branches/QUEBEC-EXPERIMENTAL/lib/t/regression/18custom_frontpage.t
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/lib/t/regression/18custom_frontpage.t	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/lib/t/regression/18custom_frontpage.t	Mon Mar 14 11:48:37 2005
@@ -23,7 +23,7 @@
 $m->get ( BaseURL.'Prefs/MyRT.html' );
 $m->form_name ('SelectionBox-body');
 # can't use submit form for mutli-valued select as it uses set_fields
-$m->field ('body-Selected' => ['component-QuickCreate', 'system-My Requests', 'system-My Tickets']);
+$m->field ('body-Selected' => ['component-QuickCreate', 'system-Unowned Tickets', 'system-My Tickets']);
 $m->click_button (name => 'remove');
 $m->form_name ('SelectionBox-body');
 $m->click_button (name => 'body-Save');
@@ -32,7 +32,7 @@
 
 $m->get ( BaseURL.'Prefs/MyRT.html' );
 $m->form_name ('SelectionBox-body');
-$m->field ('body-Available' => ['component-QuickCreate', 'system-My Requests', 'system-My Tickets']);
+$m->field ('body-Available' => ['component-QuickCreate', 'system-Unowned Tickets', 'system-My Tickets']);
 $m->click_button (name => 'add');
 
 $m->form_name ('SelectionBox-body');