[Rt-commit] r9758 - in rt/branches/3.999-DANGEROUS: . html/Admin/Elements t/web

[jesse at bestpractical.com]

Author: jesse
Date: Wed Nov 28 19:44:26 2007
New Revision: 9758

Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectScrip
   rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectScripAction
   rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectScripCondition
   rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectStage
   rt/branches/3.999-DANGEROUS/t/ticket/scrips_batch.t
   rt/branches/3.999-DANGEROUS/t/web/ticket_seen.t

Log:
 r72431 at pinglin:  jesse | 2007-11-28 18:19:04 -0500
  * passing all non-gpg tests


Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectScrip
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectScrip	(original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectScrip	Wed Nov 28 19:44:26 2007
@@ -47,11 +47,11 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
 <option value="" 
-<% $Default eq undef && 'SELECTED' %>
+<% $Default eq undef ? 'SELECTED' : '' %>
 >-</option>
 %while  (my $Scrip = $Scrips->next) {
 <option value="<% $Scrip->id %>"
-<% $Scrip->id == $Default && 'SELECTED' %>
+<% $Scrip->id == $Default ?'SELECTED' :'' %>
 ><% loc($Scrip->Name) %>
 </option>
 %}

Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectScripAction
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectScripAction	(original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectScripAction	Wed Nov 28 19:44:26 2007
@@ -51,7 +51,7 @@
 >-</option>
 %while  (my $ScripAction = $ScripActions->next) {
 <option value="<%$ScripAction->id%>"
-<% defined $Default && $ScripAction->id == $Default && 'SELECTED' %>
+<% defined $Default && $ScripAction->id == $Default ? 'SELECTED' : '' %>
 ><% loc($ScripAction->Name) %>
 </option>
 %}

Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectScripCondition
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectScripCondition	(original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectScripCondition	Wed Nov 28 19:44:26 2007
@@ -51,7 +51,7 @@
 >-</option>
 %while  (my $ScripCondition = $ScripConditions->next) {
 <option value="<%$ScripCondition->id%>"
-<% defined $Default && $ScripCondition->id == $Default && 'SELECTED' %>
+<% defined $Default && $ScripCondition->id == $Default ? 'SELECTED'  : '' %>
 ><% loc($ScripCondition->Name) %>
 </option>
 %}

Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectStage
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectStage	(original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectStage	Wed Nov 28 19:44:26 2007
@@ -52,6 +52,7 @@
 ><% loc($stage) %>
 </option>
 % }
+</select>
 <%INIT>
 if ( !defined $Default || $Default eq '') {
     $Default = 'TransactionCreate';

Modified: rt/branches/3.999-DANGEROUS/t/ticket/scrips_batch.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/scrips_batch.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/scrips_batch.t	Wed Nov 28 19:44:26 2007
@@ -19,11 +19,11 @@
 
 my $sid;
 {
-    $m->follow_link_ok( { text => 'Configuration' } );
-    $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(  text => 'Configuration'  );
+    $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->form_number(3);
     $m->field('Scrip-new-Description' => 'test');
     $m->select('Scrip-new-ScripCondition' => 'On Transaction');
@@ -70,7 +70,7 @@
 
     is_deeply parse_handle($tmp_fh), ['Create'], 'Create';
 
-    $m->follow_link_ok( { text => 'Resolve' } );
+    $m->follow_link_ok(  text => 'Resolve'  );
     $m->form_number(3);
     $m->field( "UpdateContent" => 'resolve it' );
     $m->click('SubmitTicket');

Modified: rt/branches/3.999-DANGEROUS/t/web/ticket_seen.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/ticket_seen.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/web/ticket_seen.t	Wed Nov 28 19:44:26 2007
@@ -58,11 +58,11 @@
     $agent_a->content_like(qr/bla-bla/ims, 'the message on the page');
 
     $agent_a->content_like(
-        qr/There is new messages you havn't seen/ims,
+        qr/There are unread/ims,
         'we have not seen something'
     );
 
-    $agent_a->follow_link_ok(text => 'mark');
+    $agent_a->follow_link_ok(text => 'mark them all as seen');
     $agent_a->content_like(
         qr/Marked all messages as seen/ims,
         'see success message'
@@ -70,7 +70,7 @@
 
     $agent_a->goto_ticket($tid);
     $agent_a->content_unlike(
-        qr/There is new messages you havn't seen/ims,
+        qr/There are unread/ims,
         'we have seen everything, so no messages'
     );
 }