Browse Source

Made value for default chado_ handlers optional -if none supplied then all results are shown

Lacey Sanderson 12 years ago
parent
commit
d5098627d7

+ 7 - 1
tripal_views/views/handlers/chado_views_handler_filter_boolean_operator.inc

@@ -47,8 +47,14 @@ class chado_views_handler_filter_boolean_operator extends views_handler_filter_b
    * However, if it is uses postgresql any() function to compare
    */
   function query() {
-    $this->ensure_my_table();
 
+    // make optional
+    // if it is not set or empty then don't restrict the query
+    if (!$this->value) {
+      return;
+    }
+
+    $this->ensure_my_table();
 
     $table = $this->query->get_table_info($this->table);
     if (preg_match('/aggregator/', $table['join']->definition['handler'])) {

+ 7 - 0
tripal_views/views/handlers/chado_views_handler_filter_boolean_operator_string.inc

@@ -47,6 +47,13 @@ class chado_views_handler_filter_boolean_operator_string extends views_handler_f
    * However, if it is uses postgresql any() function to compare
    */
   function query() {
+
+    // make optional
+    // if it is not set or empty then don't restrict the query
+    if (!$this->value) {
+      return;
+    }
+
     $this->ensure_my_table();
 
     $table = $this->query->get_table_info($this->table);

+ 7 - 1
tripal_views/views/handlers/chado_views_handler_filter_date.inc

@@ -47,8 +47,14 @@ class chado_views_handler_filter_date extends views_handler_filter_date {
    * However, if it is uses postgresql any() function to compare
    */
   function query() {
-    $this->ensure_my_table();
 
+    // make optional
+    // if it is not set or empty then don't restrict the query
+    if (!$this->value) {
+      return;
+    }
+
+    $this->ensure_my_table();
 
     $table = $this->query->get_table_info($this->table);
     if (preg_match('/aggregator/', $table['join']->definition['handler'])) {

+ 7 - 1
tripal_views/views/handlers/chado_views_handler_filter_equality.inc

@@ -47,8 +47,14 @@ class chado_views_handler_filter_equality extends views_handler_filter_equality
    * However, if it is uses postgresql any() function to compare
    */
   function query() {
-    $this->ensure_my_table();
 
+    // make optional
+    // if it is not set or empty then don't restrict the query
+    if (!$this->value) {
+      return;
+    }
+
+    $this->ensure_my_table();
 
     $table = $this->query->get_table_info($this->table);
     if (preg_match('/aggregator/', $table['join']->definition['handler'])) {

+ 7 - 1
tripal_views/views/handlers/chado_views_handler_filter_float.inc

@@ -47,8 +47,14 @@ class chado_views_handler_filter_float extends views_handler_filter_float {
    * However, if it is uses postgresql any() function to compare
    */
   function query() {
-    $this->ensure_my_table();
 
+    // make optional
+    // if it is not set or empty then don't restrict the query
+    if (!$this->value) {
+      return;
+    }
+
+    $this->ensure_my_table();
 
     $table = $this->query->get_table_info($this->table);
     if (preg_match('/aggregator/', $table['join']->definition['handler'])) {

+ 7 - 1
tripal_views/views/handlers/chado_views_handler_filter_numeric.inc

@@ -47,8 +47,14 @@ class chado_views_handler_filter_numeric extends views_handler_filter_numeric {
    * However, if it is uses postgresql any() function to compare
    */
   function query() {
-    $this->ensure_my_table();
 
+    // make optional
+    // if it is not set or empty then don't restrict the query
+    if (!$this->value) {
+      return;
+    }
+
+    $this->ensure_my_table();
 
     $table = $this->query->get_table_info($this->table);
     if (preg_match('/aggregator/', $table['join']->definition['handler'])) {

+ 7 - 1
tripal_views/views/handlers/chado_views_handler_filter_string.inc

@@ -47,8 +47,14 @@ class chado_views_handler_filter_string extends views_handler_filter_string {
    * However, if it is uses postgresql any() function to compare
    */
   function query() {
-    $this->ensure_my_table();
 
+    // make optional
+    // if it is not set or empty then don't restrict the query
+    if (!$this->value) {
+      return;
+    }
+
+    $this->ensure_my_table();
 
     $table = $this->query->get_table_info($this->table);
     if (preg_match('/aggregator/', $table['join']->definition['handler'])) {