[Rt-commit] rt branch, 4.2/query-like-search, created. rt-4.2.9-3-g205a1d9

Dave Goehrig dave at bestpractical.com
Tue Dec 20 16:42:58 EST 2016


The branch, 4.2/query-like-search has been created
        at  205a1d97730a638d8489735bffe1737715f85f41 (commit)

- Log -----------------------------------------------------------------
commit 205a1d97730a638d8489735bffe1737715f85f41
Author: Dave Goehrig <dave at bestpractical.com>
Date:   Tue Dec 20 16:42:46 2016 -0500

    fixing tabs

diff --git a/lib/RT/Tickets.pm b/lib/RT/Tickets.pm
index bc0ef72..4fd1a8b 100644
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@ -104,7 +104,6 @@ __PACKAGE__->RegisterCustomFieldJoin(@$_) for
 
 our %FIELD_METADATA = (
     Status          => [ 'STRING', ], #loc_left_pair
-#   Queue           => [ 'ENUM' => 'Queue', ], #loc_left_pair
     Queue           => [ 'QUEUE' ], #loc_left_pair
     Type            => [ 'ENUM', ], #loc_left_pair
     Creator         => [ 'ENUM' => 'User', ], #loc_left_pair
@@ -219,10 +218,10 @@ my %DefaultEA = (
         'NOT LIKE' => 'AND'
     },
     QUEUE => {
-	'='        => 'OR',
-	'!='       => 'AND',
-	'LIKE'     => 'OR',
-	'NOT LIKE' => 'AND'
+         '='        => 'OR',
+         '!='       => 'AND',
+         'LIKE'     => 'OR',
+         'NOT LIKE' => 'AND'
     },
     TRANSFIELD   => 'AND',
     TRANSDATE    => 'AND',
diff --git a/share/html/Search/Elements/PickBasics b/share/html/Search/Elements/PickBasics
index 5174ed4..8972278 100644
--- a/share/html/Search/Elements/PickBasics
+++ b/share/html/Search/Elements/PickBasics
@@ -83,8 +83,7 @@ my @lines = (
         Field => loc('Queue'),
         Op => {
             Type => 'component',
-            Path => '/Elements/SelectMatch',
-#           Arguments => { TrueVal=> '=', FalseVal => '!=' },
+            Path => '/Elements/SelectMatch'
         },
         Value => {
             Type => 'component',
@@ -253,10 +252,15 @@ $m->callback( Conditions => \@lines );
     // hook the op field so that we can swap between the two input types
     var op = jQuery("[name='QueueOp']");
     op.bind('change',function() {
-        text.toggle()
-        selector.toggle()
+        if (op[0].value == "=" || op[0].value == "!=" ) {
+            text.hide()
+            selector.show()
+        } else {
+            text.show()
+            selector.hide()
+        }
     })
-    op[0].value = "=";	// select "is" by default rather than "match"
+    op[0].value = "=";        // select "is" by default rather than "match"
 
     // add the fields to the DOM
     selector.before(hidden);

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


More information about the rt-commit mailing list