[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.11-37-g4507b0d

[Shawn Moore]

The branch, 4.2-trunk has been updated
       via  4507b0d416a32684a5e55340814beff4abed1a4e (commit)
      from  31b587a77c343e22e38a9e1b95b0fe1e88abb050 (commit)

Summary of changes:
 share/html/Elements/SelectNewTicketQueue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit 4507b0d416a32684a5e55340814beff4abed1a4e
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Apr 24 00:57:57 2015 +0800

    respect DefaultQueue/RememberDefaultQueue configs for QuickCreate widget
    
    in cd52b35e, we send Default arg to /Elements/SelectNewTicketQueue, which
    always overrides DefaultQueue/RememberDefaultQueue configs, and it's wrong.
    
    Fixes: I#30913

diff --git a/share/html/Elements/SelectNewTicketQueue b/share/html/Elements/SelectNewTicketQueue
index 57abc44..9c2a112 100644
--- a/share/html/Elements/SelectNewTicketQueue
+++ b/share/html/Elements/SelectNewTicketQueue
@@ -49,11 +49,14 @@
   <& /Elements/SelectQueue, Name => 'Queue', Default => $queue, %ARGS, ShowNullOption => 0, ShowAllQueues => 0 &>
 </label>
 <%INIT>
-my $queue = RT->Config->Get("DefaultQueue", $session{'CurrentUser'});
+my $queue = delete $ARGS{Default};
+if ( !$queue ) {
+    $queue = RT->Config->Get("DefaultQueue", $session{'CurrentUser'});
 
-if (RT->Config->Get("RememberDefaultQueue", $session{'CurrentUser'})) {
-    if (my $session_default = $session{'DefaultQueue'}) {
-        $queue = $session_default;
+    if (RT->Config->Get("RememberDefaultQueue", $session{'CurrentUser'})) {
+        if (my $session_default = $session{'DefaultQueue'}) {
+            $queue = $session_default;
+        }
     }
 }
 

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