[Rt-commit] r9810 - in rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html: Admin/Users Elements

[audreyt at bestpractical.com]

Author: audreyt
Date: Mon Dec  3 17:31:31 2007
New Revision: 9810

Modified:
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/Users/index.html
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SelectGroups
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SelectMatch
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SelectUsers
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Ticket/Elements/EditPeople

Log:
* SelectGroup, SelectMatch, SelectUsers: Memoize user's input between requests.

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/Users/index.html
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/Users/index.html	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/Users/index.html	Mon Dec  3 17:31:31 2007
@@ -69,8 +69,8 @@
 <br /><br />
 <form method="post" action="<% $RT::WebPath %>/Admin/Users/index.html">
 
-<&|/l&>Find people whose</&> <& /Elements/SelectUsers &><br />
-<input type="checkbox" class="checkbox" name="FindDisabledUsers" value="1" /> <&|/l&>Include disabled users in search.</&>
+<&|/l&>Find people whose</&> <& /Elements/SelectUsers, %ARGS &><br />
+<label><input type="checkbox" class="checkbox" name="FindDisabledUsers" value="1" /> <&|/l&>Include disabled users in search.</&></label>
 <br />
 <div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div> 
 </form>

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SelectGroups
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SelectGroups	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SelectGroups	Mon Dec  3 17:31:31 2007
@@ -47,16 +47,22 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="GroupField">
 % foreach my $col (RT::Group->BasicColumns) {
-<option value="<% $col->[0] %>"><% loc($col->[1]) %></option>
+<option <% ($GroupField eq $col->[0]) ? 'SELECTED' : '' %> value="<% $col->[0] %>"><% loc($col->[1]) %></option>
 % }
 % while (my $CF = $CFs->Next) {
-<option value="CustomField-<% $CF->Id %>"><&|/l&>CustomField</&>: <% $CF->Name %></option>
+%   my $val = "CustomField-" . $CF->Id;
+<option <% ($GroupField eq $val) ? 'SELECTED' : '' %> value="<% $val %>"><&|/l&>CustomField</&>: <% $CF->Name %></option>
 % }
 </select>
-<& /Elements/SelectMatch, Name=> 'GroupOp' &>
-<input size="8" name="GroupString" />
+<& /Elements/SelectMatch, Name => 'GroupOp', Default => $GroupOp &>
+<input size="8" name="GroupString" value="<% $GroupString %>" />
 <%INIT>
 my $CFs = RT::CustomFields->new($session{'CurrentUser'});
 $CFs->LimitToChildType('RT::Group');
 $CFs->OrderBy( FIELD => 'Name' );
 </%INIT>
+<%ARGS>
+$GroupField  => ''
+$GroupOp     => ''
+$GroupString => ''
+</%ARGS>

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SelectMatch
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SelectMatch	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SelectMatch	Mon Dec  3 17:31:31 2007
@@ -67,13 +67,13 @@
 my $LikeDefault=''; 
 my $NotLikeDefault ='';
 
-if ($Default && $Default =~ /false/i) {
+if ($Default && $Default =~ /false|!=/i) {
 	$FalseDefault = "SELECTED";
 }
-elsif ($Default && $Default =~ /true/i) {
+elsif ($Default && $Default =~ /true|=/i) {
 	$TrueDefault = "SELECTED";
 } 
-elsif ($Default && $Default =~ /notlike/i) {
+elsif ($Default && $Default =~ /notlike|NOT LIKE/i) {
 	$NotLikeDefault = "SELECTED";
 }
 else {

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SelectUsers
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SelectUsers	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SelectUsers	Mon Dec  3 17:31:31 2007
@@ -47,16 +47,22 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="UserField">
 % foreach my $col (RT::User->BasicColumns) {
-<option value="<% $col->[0] %>"><% loc($col->[1]) %></option>
+<option <% ($UserField eq $col->[0]) ? 'SELECTED' : '' %> value="<% $col->[0] %>"><% loc($col->[1]) %></option>
 % }
 % while (my $CF = $CFs->Next) {
-<option value="CustomField-<% $CF->Id %>"><&|/l&>CustomField</&>: <% $CF->Name %></option>
+%   my $val = "CustomField-" . $CF->Id;
+<option <% ($UserField eq $val) ? 'SELECTED' : '' %> value="<% $val %>"><&|/l&>CustomField</&>: <% $CF->Name %></option>
 % }
 </select>
-<& /Elements/SelectMatch, Name=> 'UserOp' &>
-<input size="8" name="UserString" />
+<& /Elements/SelectMatch, Name => 'UserOp', Default => $UserOp &>
+<input size="8" name="UserString" value="<% $UserString %>" />
 <%INIT>
 my $CFs = RT::CustomFields->new($session{'CurrentUser'});
 $CFs->LimitToChildType('RT::User');
 $CFs->OrderBy( FIELD => 'Name' );
 </%INIT>
+<%ARGS>
+$UserField  => ''
+$UserOp     => ''
+$UserString => ''
+</%ARGS>

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Ticket/Elements/EditPeople
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Ticket/Elements/EditPeople	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Ticket/Elements/EditPeople	Mon Dec  3 17:31:31 2007
@@ -51,11 +51,11 @@
 
 <h3><&|/l&>New watchers</&></h3>
 <&|/l&>Find people whose</&><br />
-<& /Elements/SelectUsers &>
+<& /Elements/SelectUsers, %ARGS &>
 <input type="submit" class="button" name="OnlySearchForPeople" value="<&|/l&>Go!</&>" />
 <br />
 <&|/l&>Find groups whose</&><br />
-<& /Elements/SelectGroups &>
+<& /Elements/SelectGroups, %ARGS &>
 <input type="submit" class="button" name="OnlySearchForGroup" value="<&|/l&>Go!</&>" />
 
 <& AddWatchers, Ticket => $Ticket, UserString => $UserString,