[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-1003-gfabd3be

[Jesse Vincent]

The branch, 3.9-trunk has been updated
       via  fabd3be5a5ede720e4fde0ffea6d56d2ff10c639 (commit)
       via  6a3a872b074f83d7dad8073b2c8b6b131d79f57d (commit)
      from  ff80d1a902875e402d87bb1550282341efe2f19e (commit)

Summary of changes:
 share/html/Elements/CreateTicket |    5 -----
 share/html/Elements/SelectQueue  |   29 +++++++++++------------------
 2 files changed, 11 insertions(+), 23 deletions(-)

- Log -----------------------------------------------------------------
commit 6a3a872b074f83d7dad8073b2c8b6b131d79f57d
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Dec 21 20:12:50 2010 -0500

    Revert "lift the "default" menu list item to the top of the queue list, for easier selection"
    
    This reverts commit ff80d1a902875e402d87bb1550282341efe2f19e.

diff --git a/share/html/Elements/SelectQueue b/share/html/Elements/SelectQueue
index ec836ae..7abdd5f 100755
--- a/share/html/Elements/SelectQueue
+++ b/share/html/Elements/SelectQueue
@@ -46,23 +46,21 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 % if ($Lite) {
-<input name="<%$Name%>" size="25" value="<%$default_queue->Name%>" class="<%$Class%>" />
+%     my $d = RT::Queue->new($session{'CurrentUser'});
+%     $d->Load($Default);
+<input name="<%$Name%>" size="25" value="<%$d->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>
-% }
-% 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}%>\
+  <option value="<% ($NamedValues ? $queue->{Name} : $queue->{Id}) %>"\
+% if ($queue->{Id} eq ($Default||'') || $queue->{Name} eq ($Default||'')) {
+ selected="selected"\
+% }
+><%$queue->{Name}%>\
 %             if ($Verbose and $queue->{Description}) {
  (<%$queue->{Description}%>)\
 %             }
@@ -113,9 +111,4 @@ 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>

commit fabd3be5a5ede720e4fde0ffea6d56d2ff10c639
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Dec 21 20:13:12 2010 -0500

    Revert "Remove the submit button we don't need for the create ticket widget"
    
    This reverts commit a3b14f9764567cde477e727515353567a20dfac1.

diff --git a/share/html/Elements/CreateTicket b/share/html/Elements/CreateTicket
index 36f13aa..f14e837 100755
--- a/share/html/Elements/CreateTicket
+++ b/share/html/Elements/CreateTicket
@@ -50,11 +50,6 @@
 >
 <&|/l, $m->scomp('/Elements/SelectNewTicketQueue', OnChange => 'document.CreateTicketInQueue.submit()', SendTo => $SendTo ) &><input type="submit" class="button" value="New ticket in" />&nbsp;[_1]</&>
 % $m->callback(CallbackName => 'BeforeFormEnd');
-<script>
-jQuery('#CreateTicketInQueue select').prepend('<option value=""><%loc('Create ticket...')%></option>');
-jQuery('#CreateTicketInQueue input').remove();
-
-</script>
 </form>
 <%ARGS>
 $SendTo => '/Ticket/Create.html',

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