Browse Source

DB: Updated enable views to use tripal views api function and fixed default views name to follow module_admin_name convention

Lacey Sanderson 11 years ago
parent
commit
d9db0cf206

+ 2 - 2
tripal_db/includes/tripal_db.admin.inc

@@ -16,8 +16,8 @@ function tripal_db_admin_db_listing() {
   drupal_set_breadcrumb($breadcrumb);
 
   // Add the view
-  $dbs_view = views_embed_view('db_admin','default');
-  $dbxrefs_view = views_embed_view('db_reference_admin','default');
+  $dbs_view = views_embed_view('tripal_db_admin_dbs','default');
+  $dbxrefs_view = views_embed_view('tripal_db_admin_dbxrefs','default');
   if (isset($dbs_view) && isset($dbxrefs_view)) {
     $output .= $dbs_view;
   }

+ 14 - 0
tripal_db/tripal_db.module

@@ -63,6 +63,20 @@ function tripal_db_menu() {
     'type' => MENU_CALLBACK,
   );
 
+  $items['admin/tripal/chado/tripal_db/views/dbs/enable'] = array(
+    'title' => 'Enable Database Administrative View',
+    'page callback' => 'tripal_views_admin_enable_view',
+    'page arguments' => array('tripal_db_admin_dbs', 'admin/tripal/chado/tripal_db'),
+    'access arguments' => array('administer controlled vocabularies'),
+    'type' => MENU_CALLBACK,
+  );
+  $items['admin/tripal/chado/tripal_db/views/dbxrefs/enable'] = array(
+    'title' => 'Enable Reference Administrative View',
+    'page callback' => 'tripal_views_admin_enable_view',
+    'page arguments' => array('tripal_db_admin_dbxrefs', 'admin/tripal/chado/tripal_db'),
+    'access arguments' => array('administer controlled vocabularies'),
+    'type' => MENU_CALLBACK,
+  );
 
   return $items;
 }

+ 2 - 2
tripal_db/tripal_db.views_default.inc

@@ -22,7 +22,7 @@ function tripal_db_views_default_views() {
 function tripal_db_defaultview_admin_db_listing() {
 
   $view = new view();
-  $view->name = 'db_admin';
+  $view->name = 'tripal_db_admin_dbs';
   $view->description = 'A listing of all databases.';
   $view->tag = 'tripal admin';
   $view->base_table = 'db';
@@ -200,7 +200,7 @@ function tripal_db_defaultview_admin_db_listing() {
 function tripal_db_defaultview_admin_dbxref_listing() {
 
   $view = new view();
-  $view->name = 'db_reference_admin';
+  $view->name = 'tripal_db_admin_dbxrefs';
   $view->description = '';
   $view->tag = 'tripal admin';
   $view->base_table = 'dbxref';