Prechádzať zdrojové kódy

Fixed hard-coded handler names that changed from chado_ to tripal_

Lacey Sanderson 12 rokov pred
rodič
commit
51e6d550ea

+ 2 - 2
tripal_analysis/tripal_analysis.views.inc

@@ -39,8 +39,8 @@ function tripal_analysis_views_data()  {
       $table_integration_array = tripal_views_get_integration_array_for_chado_table($tablename, TRUE);
 
       // Make table-specific modifications
-      $table_integration_array['fields']['program']['handlers']['filter']['name'] = 'chado_views_handler_filter_select_string';
-      $table_integration_array['fields']['algorithm']['handlers']['filter']['name'] = 'chado_views_handler_filter_select_string';
+      $table_integration_array['fields']['program']['handlers']['filter']['name'] = 'tripal_views_handler_filter_select_string';
+      $table_integration_array['fields']['algorithm']['handlers']['filter']['name'] = 'tripal_views_handler_filter_select_string';
 
       tripal_views_integration_add_entry($table_integration_array);
     }

+ 2 - 2
tripal_cv/tripal_cv.views.inc

@@ -46,10 +46,10 @@ function tripal_cv_views_data() {
 
         // add specialty handlers
         if ($tablename == 'cvterm') {
-          $table_integration_array['fields']['name']['handlers']['filter']['name'] = 'views_handler_filter_chado_select_string';
+          $table_integration_array['fields']['name']['handlers']['filter']['name'] = 'tripal_views_handler_filter_select_string';
         }
         elseif ($tablename == 'cv') {
-          $table_integration_array['fields']['name']['handlers']['filter']['name'] = 'views_handler_filter_chado_select_string';
+          $table_integration_array['fields']['name']['handlers']['filter']['name'] = 'tripal_views_handler_filter_select_string';
         }
 
         // add integration

+ 1 - 1
tripal_db/tripal_db.views.inc

@@ -42,7 +42,7 @@ function tripal_db_views_data()  {
 
         // add specialty handlers
         if ($tablename == 'db') {
-          $table_integration_array['fields']['name']['handlers']['filter']['name'] = 'views_handler_filter_chado_select_string';
+          $table_integration_array['fields']['name']['handlers']['filter']['name'] = 'tripal_views_handler_filter_select_string';
         }
 
         tripal_views_integration_add_entry($table_integration_array);

+ 2 - 2
tripal_natural_diversity/tripal_natural_diversity.views.inc

@@ -36,8 +36,8 @@ function tripal_natural_diversity_views_data()  {
         // Add specialty handlers
         switch ($tablename) {
           case 'nd_geolocation':
-            $table_integration_array['fields']['description']['handlers']['filter']['name'] = 'chado_views_handler_filter_select_string';
-            $table_integration_array['fields']['geodetic_datum']['handlers']['filter']['name'] = 'chado_views_handler_filter_select_string';
+            $table_integration_array['fields']['description']['handlers']['filter']['name'] = 'tripal_views_handler_filter_select_string';
+            $table_integration_array['fields']['geodetic_datum']['handlers']['filter']['name'] = 'tripal_views_handler_filter_select_string';
             $table_integration_array['fields']['latitude']['handlers']['filter']['name'] = 'chado_views_handler_filter_float';
             $table_integration_array['fields']['longitude']['handlers']['filter']['name'] = 'chado_views_handler_filter_float';
             $table_integration_array['fields']['altitude']['handlers']['filter']['name'] = 'chado_views_handler_filter_float';

+ 4 - 4
tripal_organism/tripal_organism.views.inc

@@ -40,10 +40,10 @@ function tripal_organism_views_data()  {
         $table_integration_array = tripal_views_get_integration_array_for_chado_table($tablename, TRUE);
 
         // Add specialty handlers
-        $table_integration_array['fields']['common_name']['handlers']['filter']['name'] = 'views_handler_filter_chado_select_string';
-        $table_integration_array['fields']['genus']['handlers']['filter']['name'] = 'views_handler_filter_chado_select_string';
-        $table_integration_array['fields']['species']['handlers']['filter']['name'] = 'views_handler_filter_chado_select_string';
-        $table_integration_array['fields']['abbreviation']['handlers']['filter']['name'] = 'views_handler_filter_chado_select_string';
+        $table_integration_array['fields']['common_name']['handlers']['filter']['name'] = 'tripal_views_handler_filter_select_string';
+        $table_integration_array['fields']['genus']['handlers']['filter']['name'] = 'tripal_views_handler_filter_select_string';
+        $table_integration_array['fields']['species']['handlers']['filter']['name'] = 'tripal_views_handler_filter_select_string';
+        $table_integration_array['fields']['abbreviation']['handlers']['filter']['name'] = 'tripal_views_handler_filter_select_string';
 
         tripal_views_integration_add_entry($table_integration_array);
       }

+ 1 - 1
tripal_views/api/tripal_views.api.inc

@@ -474,7 +474,7 @@ function tripal_views_get_integration_array_for_chado_table($table_name, $base_t
 
       // Specify specialty handlers
       if ($field_name == 'type_id' OR $field_name == 'cvterm_id') {
-        $defn_array['fields'][$field_name]['handlers']['filter']['name'] = 'chado_views_handler_filter_select_cvterm';
+        $defn_array['fields'][$field_name]['handlers']['filter']['name'] = 'tripal_views_handler_filter_select_cvterm';
       }
     }
   }