[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-1001-gff80d1a

[Jesse Vincent]

The branch, 3.9-trunk has been updated
       via  ff80d1a902875e402d87bb1550282341efe2f19e (commit)
      from  8b5940492279b8c1bca87959797e08b0acf288f2 (commit)

Summary of changes:
 share/html/Elements/SelectQueue |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

- Log -----------------------------------------------------------------
commit ff80d1a902875e402d87bb1550282341efe2f19e
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Dec 21 19:30:12 2010 -0500

    lift the "default" menu list item to the top of the queue list, for easier selection

diff --git a/share/html/Elements/SelectQueue b/share/html/Elements/SelectQueue
index 7abdd5f..ec836ae 100755
--- a/share/html/Elements/SelectQueue
+++ b/share/html/Elements/SelectQueue
@@ -46,21 +46,23 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 % if ($Lite) {
-%     my $d = RT::Queue->new($session{'CurrentUser'});
-%     $d->Load($Default);
-<input name="<%$Name%>" size="25" value="<%$d->Name%>" class="<%$Class%>" />
+<input name="<%$Name%>" size="25" value="<%$default_queue->Name%>" class="<%$Class%>" />
 % }
 % else {
-<select name="<%$Name%>" <% ($Multiple) ? qq{multiple="multiple" size="$Size"} : '' |n%> <% ($OnChange) ? 'onchange="'.$OnChange.'"' : '' |n %> class="<%$Class%>">
-%     if ($ShowNullOption) {
+<select name="<%$Name%>" <% ($Multiple) ? qq{multiple="multiple" size="$Size"} : '' |n%>\
+     <% ($OnChange) ? 'onchange="'.$OnChange.'"' : '' |n %> class="<%$Class%>">
+% if ($ShowNullOption) {
   <option value=""><% $DefaultLabel %></option>
-%     }
-%     for my $queue (@{$session{$cache_key}{queues}}) {
-  <option value="<% ($NamedValues ? $queue->{Name} : $queue->{Id}) %>"\
-% if ($queue->{Id} eq ($Default||'') || $queue->{Name} eq ($Default||'')) {
- selected="selected"\
 % }
-><%$queue->{Name}%>\
+% if ($default_queue->id) {
+ <option value="<% $NamedValues ? $default_queue->Name : $default_queue->id %>"><%$default_queue->Name%>\
+% if ($Verbose && $default_queue->Description) {
+ (<%$default_queue->Description%>)\
+% }
+</option>
+%}
+%     for my $queue (@{$session{$cache_key}{queues}}) {
+  <option value="<% ($NamedValues ? $queue->{Name} : $queue->{Id}) %>"><%$queue->{Name}%>\
 %             if ($Verbose and $queue->{Description}) {
  (<%$queue->{Description}%>)\
 %             }
@@ -111,4 +113,9 @@ if ( not defined $session{$cache_key} and not $Lite ) {
     }
     $session{$cache_key}{lastupdated} = time();
 }
+
+my $default_queue = RT::Queue->new($session{CurrentUser});
+if ($Default) {
+    $default_queue->Load($Default);
+}
 </%init>

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