[Rt-commit] [svn] r1387 - in rt/branches/3.3-TESTING: . html/REST/1.0/NoAuth html/Search html/Search/Elements

jesse at pallas.eruditorum.org jesse at pallas.eruditorum.org
Wed Sep 1 00:10:48 EDT 2004


Author: jesse
Date: Wed Sep  1 00:10:48 2004
New Revision: 1387

Modified:
   rt/branches/3.3-TESTING/   (props changed)
   rt/branches/3.3-TESTING/html/REST/1.0/NoAuth/mail-gateway
   rt/branches/3.3-TESTING/html/Search/Build.html
   rt/branches/3.3-TESTING/html/Search/Elements/DisplayOptions
   rt/branches/3.3-TESTING/html/Search/Elements/PickBasics
   rt/branches/3.3-TESTING/html/Search/Elements/PickCFs
   rt/branches/3.3-TESTING/html/Search/Elements/PickCriteria
Log:
 ----------------------------------------------------------------------
 r8302 at tinbook:  jesse | 2004-07-28T20:59:42.277484Z
 
 ----------------------------------------------------------------------
 r10109 at tinbook:  jesse | 2004-09-01T04:08:25.198125Z
 rewrote mail gateway shim to be a bit more robust
 ----------------------------------------------------------------------
 r10110 at tinbook:  jesse | 2004-09-01T04:09:17.429478Z
 Started to refactor the query builder ui code to yank out the bogus logic.
 ----------------------------------------------------------------------


Modified: rt/branches/3.3-TESTING/html/REST/1.0/NoAuth/mail-gateway
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/NoAuth/mail-gateway	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/NoAuth/mail-gateway	Wed Sep  1 00:10:48 2004
@@ -43,6 +43,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# }}} END BPS TAGGED BLOCK
+
 <%flags>
 inherit => undef # inhibit UTF8 conversion done in /autohandler
 </%flags>
@@ -71,4 +72,6 @@
  }   else { 
 $m->out('not ok - '.$error);
  }
+
+$m->abort();
 </%init>

Modified: rt/branches/3.3-TESTING/html/Search/Build.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Build.html	(original)
+++ rt/branches/3.3-TESTING/html/Search/Build.html	Wed Sep  1 00:10:48 2004
@@ -95,6 +95,11 @@
 AvailableColumns => $AvailableColumns,  CurrentFormat => $CurrentFormat, RowsPerPage => $RowsPerPage, OrderBy => $OrderBy, Order => $Order &>
 </td>
 </tr>
+<tr>
+<td colspan=2 class="boxcontainer">
+<& /Elements/Submit, Caption => "Do the Search", Label => loc('Search'), Name => 'DoSearch'&>
+</td>
+</tr>
 </table>
 </FORM>
 

Modified: rt/branches/3.3-TESTING/html/Search/Elements/DisplayOptions
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/DisplayOptions	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/DisplayOptions	Wed Sep  1 00:10:48 2004
@@ -91,7 +91,6 @@
 </td>
 </tr>
 </table>
-<& /Elements/Submit, Caption => "Do the Search", Label => loc('Search'), Name => 'DoSearch'&>
 <& /Elements/TitleBoxEnd &>
 
 <%INIT>

Modified: rt/branches/3.3-TESTING/html/Search/Elements/PickBasics
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/PickBasics	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/PickBasics	Wed Sep  1 00:10:48 2004
@@ -42,12 +42,19 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
-<table cellspacing=0 border=0>
-<tr><td>
-% foreach my $field (@fields) {
+%# END BPS TAGGED BLOCK
+
+<tr>
+<td class="label">
+<&|/l&>id</&>
+</td><td>
+<& /Elements/SelectEqualityOperator, Name => "idOp" &>
+</td><td>
+<INPUT Name="ValueOfid" SIZE=5>
+</td>
+</tr>
+
 <tr><td align=right>
-% if ($field eq "Attachment") {
 <& /Elements/SelectAttachmentField, Name => 'AttachmentField' &>
 </td><td>
 <& /Elements/SelectBoolean, Name => "AttachmentOp", 
@@ -58,44 +65,23 @@
 &> 
 </td><td>
 <Input Name="ValueOfAttachment" Size=20>
-% } elsif ($field eq "Dates") {
-<& /Elements/SelectDateType, Name=>"DateField" &>
-</td><td>
-<& /Elements/SelectDateRelation, Name=>"DateOp" &>
-</td><td>
-<& /Elements/SelectDate, Name => "ValueOfDate", ShowTime => 0, Default => '' &>
-% } elsif ($field eq "Links") {
-<& SelectLinks, Name=>"LinksField" &>
-</td><td>
-<& /Elements/SelectBoolean, Name => "LinksOp", 
-			    True => loc("is"), 
-  			    False => loc("isn't"), 
-			    TrueVal=> '=', 
-			    FalseVal => '!=' 
-&>  
-</td><td>
-<INPUT Name="ValueOfLinks" value="" SIZE=5>
-%} elsif ($field eq "Priority") {
-<SELECT NAME="PriorityField">
-<OPTION VALUE="Priority"><&|/l&>Priority</&></OPTION>
-<OPTION VALUE="InitialPriority"><&|/l&>Initial Priority</&></OPTION>
-<OPTION VALUE="FinalPriority"><&|/l&>Final Priority</&></OPTION>
-</SELECT>
-</td><td>
-<& /Elements/SelectEqualityOperator, Name => "PriorityOp" &>
-</td><td>
-<INPUT Name="ValueOfPriority" SIZE=5>
-%} elsif ($field =~ m/Time.*/) {
-<SELECT NAME="TimeField">
-<OPTION VALUE="TimeWorked"><&|/l&>Time Worked</&></OPTION>
-<OPTION VALUE="TimeEstimated"><&|/l&>Time Estimated</&></OPTION>
-<OPTION VALUE="TimeLeft"><&|/l&>Time Left</&></OPTION>
-</SELECT>
+</td>
+</tr>
+<tr>
+<td class="label">
+<&|/l&>Queue</&>
 </td><td>
-<& /Elements/SelectEqualityOperator, Name => "TimeOp" &>
+<& /Elements/SelectBoolean,  Name => "QueueOp" , 
+					True => loc("is"), 
+					False => loc("isn't"), 
+					TrueVal=> '=', 
+					FalseVal => '!=' &>
 </td><td>
-<INPUT Name="ValueOfTime" SIZE=5>
-% } elsif ($field eq "Status") {
+<& /Elements/SelectQueue, Name => "ValueOfQueue", NamedValues => 1 &>
+</td>
+</tr>
+<tr>
+<td class="label">
 <&|/l&>Status</&>
 </td><td>
 <& /Elements/SelectBoolean, Name => "StatusOp", 
@@ -106,32 +92,9 @@
 &>  
 </td><td>
 <& /Elements/SelectStatus, Name => "ValueOfStatus", SkipDeleted => 1 &>
-%} elsif ($field =~ m/.*Priority/ || $field =~ m/Time.*/) {
-<&|/l&><%$field%></&>
-</td><td>
-<& /Elements/SelectEqualityOperator, Name => $field . "Op" &>
-</td><td>
-<INPUT Name="<%"ValueOf" . $field%>" SIZE=5>
-% } elsif ($field eq "Queue") {
-<&|/l&>Queue</&>
-</td><td>
-<& /Elements/SelectBoolean,  Name => "QueueOp" , 
-					True => loc("is"), 
-					False => loc("isn't"), 
-					TrueVal=> '=', 
-					FalseVal => '!=' &>
-</td><td>
-<& /Elements/SelectQueue, Name => "ValueOfQueue", NamedValues => 1 &>
-% } elsif ($field eq "id") {
-<&|/l&>Id</&>
-</td><td>
-<& /Elements/SelectEqualityOperator, Name => "idOp" &>
-</td><td>
-<INPUT Name="ValueOfid" SIZE=5>
-% } elsif ($field eq "People") {
-% foreach my $field (@people) {
+</td>
+</tr>
 <tr><td class="label">
-% if ($field eq "Actor") {
 <SELECT NAME="ActorField">
 <OPTION VALUE="Owner"><&|/l&>Owner</&></OPTION>
 <OPTION VALUE="Creator"><&|/l&>Creator</&></OPTION>
@@ -144,13 +107,18 @@
 &> 
 </td><td>
 <& /Elements/SelectOwner, Name => "ValueOfActor" &>
-% } elsif ($field eq 'Watcher') {
+</td>
+</tr>
+<tr>
+<td class="label">
 <& SelectPersonType, Name => 'WatcherField', Default => 'Requestor' &>
 </td><td>
 <& /Elements/SelectMatch, Name => "WatcherOp" &>
 </td><td>
 <Input Name="ValueOfWatcher" Size=20>
-% } elsif ($field eq 'WatcherGroup') {
+</tr>
+<tr>
+<td class="label">
 <& SelectPersonType, Name => 'WatcherGroupField', Default => 'RequestorGroup', Suffix => 'Group' &>
 </td><td>
 <& /Elements/SelectBoolean, Name => "WatcherGroupOp", 
@@ -161,35 +129,55 @@
 &>
 </td><td>
 <& SelectGroup, Name => 'ValueOfWatcherGroup' &>
-% } else {
-<% loc($field) %>
-<& /Elements/SelectMatch, Name => "$field" . "Op" &>
-<INPUT Name="<%"ValueOf" . $field%>" value=""SIZE=20>
-% }
+</td> 
+</tr>
+<tr>
+<td class="label">
+<& /Elements/SelectDateType, Name=>"DateField" &>
+</td><td>
+<& /Elements/SelectDateRelation, Name=>"DateOp" &>
+</td><td>
+<& /Elements/SelectDate, Name => "ValueOfDate", ShowTime => 0, Default => '' &>
 </td></tr>
-% }
-% } else {
-<% loc($field) %>
+<tr>
+<td class="label">
+<SELECT NAME="TimeField">
+<OPTION VALUE="TimeWorked"><&|/l&>Time Worked</&></OPTION>
+<OPTION VALUE="TimeEstimated"><&|/l&>Time Estimated</&></OPTION>
+<OPTION VALUE="TimeLeft"><&|/l&>Time Left</&></OPTION>
+</SELECT>
+</td><td>
+<& /Elements/SelectEqualityOperator, Name => "TimeOp" &>
+</td><td>
+<INPUT Name="ValueOfTime" SIZE=5>
+</td>
+</tr>
+<tr>
+<td class="label">
+<SELECT NAME="PriorityField">
+<OPTION VALUE="Priority"><&|/l&>Priority</&></OPTION>
+<OPTION VALUE="InitialPriority"><&|/l&>Initial Priority</&></OPTION>
+<OPTION VALUE="FinalPriority"><&|/l&>Final Priority</&></OPTION>
+</SELECT>
 </td><td>
-<& /Elements/SelectMatch, Name => "$field" . "Op" &>
+<& /Elements/SelectEqualityOperator, Name => "PriorityOp" &>
+</td><td>
+<INPUT Name="ValueOfPriority" SIZE=5>
+</td>
+</tr>
+<tr>
+<td class="label">
+<& SelectLinks, Name=>"LinksField" &>
 </td><td>
-<INPUT Name="<%"ValueOf" . $field%>" value="" SIZE=20>
-% }
+<& /Elements/SelectBoolean, Name => "LinksOp", 
+			    True => loc("is"), 
+  			    False => loc("isn't"), 
+			    TrueVal=> '=', 
+			    FalseVal => '!=' &>  
+</td><td>
+<INPUT Name="ValueOfLinks" value="" SIZE=5>
 </td></tr>
-% }
-<& '/Elements/Callback', _CallbackName => 'EndOfList' &>
 <%INIT>
-my @fields = ('Attachment',
-    'Queue',
-    'Status',
-    'People',
-    'Dates',
-    'Time',
-    'Priority',
-    'Links',
-    'id',
-    );
-
 my @people = ('Actor',
 	      'Watcher',
 	      'WatcherGroup',

Modified: rt/branches/3.3-TESTING/html/Search/Elements/PickCFs
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/PickCFs	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/PickCFs	Wed Sep  1 00:10:48 2004
@@ -43,23 +43,23 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# }}} END BPS TAGGED BLOCK
-<table cellspacing=0 border=0>
 % while ( my $CustomField = $CustomFields->Next ) {
-<tr><td>
 % my $name = "'CF." . $CustomField->Name . "'";
+<tr><td class="label">
 <% $CustomField->Name %> 
+</td>
+<td>
         <& /Elements/SelectCustomFieldOperator, Name => $name . "Op", 
                                     True => loc("is"), 
                                     False => loc("isn't"), 
                                     TrueVal=> '=', FalseVal => '!=' &>
-
+</td>
+<td>
 <& /Elements/SelectCustomFieldValue, Name => "ValueOf" . $name,
                             CustomField => $CustomField,
                             &>
 </td></tr>
 % }
-</table>
-
 <%INIT>
 my $CustomFields = RT::CustomFields->new( $session{'CurrentUser'});
 foreach my $id (keys %cfqueues) {

Modified: rt/branches/3.3-TESTING/html/Search/Elements/PickCriteria
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/PickCriteria	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/PickCriteria	Wed Sep  1 00:10:48 2004
@@ -62,12 +62,10 @@
   </tr>
   <tr>
     <td valign=top>
+      <table cellspacing=0 border=0>
       <& PickBasics &>
-    </td>
-  </tr>
-  <tr>
-    <td valign=top>
     <& PickCFs, cfqueues => \%cfqueues &>
+    </table>
     </td>
   </tr>
   <tr><td>&nbsp;</td></tr>


More information about the Rt-commit mailing list