Browse Source

Bulk Loader: Fix to default view and updated enable view to use the new tripal views api functions

Lacey Sanderson 11 years ago
parent
commit
1d0b668d7c

+ 0 - 14
tripal_bulk_loader/includes/tripal_bulk_loader.admin.inc

@@ -41,20 +41,6 @@ function tripal_bulk_loader_admin_jobs_listing() {
   return $output;
 }
 
-function tripal_bulk_loader_admin_enable_view($view_name) {
-
-  $status = variable_get('views_defaults', array());
-  if (isset($status[$view_name])) {
-    $status[$view_name] = FALSE;
-    variable_set('views_defaults', $status);
-    drupal_set_message("Successfully Enabled $view_name");
-  }
-  else {
-    drupal_set_message("Unable to find a view by the name of '$view_name'",'error');
-  }
-  drupal_goto('admin/tripal/loaders/bulk');
-}
-
 /**
  * @section
  * Configuration Form

+ 4 - 4
tripal_bulk_loader/tripal_bulk_loader.module

@@ -84,16 +84,16 @@ function tripal_bulk_loader_menu() {
   $items['admin/tripal/loaders/bulk/views/jobs/enable'] = array(
     'title' => 'Enable Jobs Administrative View',
     'description' => 'Enable Jobs Administrative View',
-    'page callback' => 'tripal_bulk_loader_admin_enable_view',
-    'page arguments' => array('tripal_bulk_loading_jobs'),
+    'page callback' => 'tripal_views_admin_enable_view',
+    'page arguments' => array('tripal_bulk_loading_jobs','admin/tripal/loaders/bulk'),
     'access arguments' => array('administer tripal_bulk_loader'),
     'type' => MENU_CALLBACK,
   );
   $items['admin/tripal/loaders/bulk/views/templates/enable'] = array(
     'title' => 'Enable Templates Administrative View',
     'description' => 'Enable Templates Administrative View',
-    'page callback' => 'tripal_bulk_loader_admin_enable_view',
-    'page arguments' => array('tripal_bulk_loader_templates'),
+    'page callback' => 'tripal_views_admin_enable_view',
+    'page arguments' => array('tripal_bulk_loader_templates', 'admin/tripal/loaders/bulk'),
     'access arguments' => array('administer tripal_bulk_loader'),
     'type' => MENU_CALLBACK,
   );

+ 1 - 0
tripal_bulk_loader/tripal_bulk_loader.views_default.inc

@@ -287,6 +287,7 @@ function tripal_bulk_loader_defaultview_admin_template_listing() {
   $handler->display->display_options['header']['area']['table'] = 'views';
   $handler->display->display_options['header']['area']['field'] = 'area';
   $handler->display->display_options['header']['area']['label'] = 'Add Template';
+  $handler->display->display_options['header']['area']['empty'] = TRUE;
   $handler->display->display_options['header']['area']['content'] = '<ul class="action-links">
       <li><a href="template/create">Add Template</a></li>
       <li><a href="templates/import">Import Template</a></li>