respect DefaultQueue/RememberDefaultQueue configs for QuickCreate widget

in cd52b35, we send Default arg to /Elements/SelectNewTicketQueue, which always overrides DefaultQueue/RememberDefaultQueue configs, and it's wrong. Fixes: I#30913
bestpractical · Jul 16, 2015 · 4507b0d · 4507b0d
1 parent 31b587a
commit 4507b0d
Showing 1 changed file with 7 additions and 4 deletions.
diff --git 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;
+        }
     }
 }