瀏覽代碼

commenting out the ahah parts of the tripal_views_setup new form"

alexgl 13 年之前
父節點
當前提交
96fbb06dbf

+ 48 - 7
base/tripal_views_setup/includes/tripal_views_setup.admin.inc

@@ -56,9 +56,11 @@ function tripal_views_setup_admin_form_submit($form, &$form_state){
 	db_query("DELETE FROM public.tripal_mviews_join WHERE setup_id = $value;");
 }
 
-function tripal_views_setup_new_search_form(){
+function tripal_views_setup_new_search_form($form_state){
 	$form = array();
 	
+	$form['#cache'] = TRUE;
+	
 	$form['row_name'] = array(
 		'#title' => t('Name'),
 		'#type' => 'textfield',
@@ -77,20 +79,32 @@ function tripal_views_setup_new_search_form(){
 		'#required' => TRUE,
 	);
 	
+	$mview_query = db_query("SELECT name FROM {tripal_mviews} ORDER BY name;");
+	$mview_options = array();
+	while ($mview_option = db_fetch_array($mview_query)){
+		$mview_options[] = $mview_option['name'];
+	}
+	
 	$form['row_mview'] = array(
 		'#title' => t('Materialized View'),
 		'#type' => 'select',
-		'#options' => array('stub'),
-		'#maxlength' => 128,
+		'#options' => $mview_options,
 		'#description' => 'Which materialized view to use.',
 		'#required' => TRUE,
+		// '#ahah' => array(
+			// 'path' => 'rowmview/ahah',
+			// 'wrapper' => 'rowmview-ahah',
+			// 'effect' => 'fade',
+			// 'event' => 'change',
+			// 'method' => 'replace',
+		// ),
 	);
 	
 	$form['row_base_table_name'] = array(
 		'#title' => t('Base Table Name'),
 		'#type' => 'select',
-		'#options' => array('stub'),
-		'#maxlength' => 128,
+		// '#options' => array('stub'),
+		'#options' => tripal_core_get_chado_tables(),
 		'#description' => 'Select which chado table to use for this view.',
 		'#required' => TRUE,
 	);
@@ -101,16 +115,15 @@ function tripal_views_setup_new_search_form(){
 		'#title' => t('View Column'),
 		'#type' => 'select',
 		'#options' => array('stub'),
-		'#maxlength' => 128,
 		'#description' => 'Which materialized view column to use.',
 		'#required' => TRUE,
+
 	);
 	
 		$form['row_chado_column'] = array(
 		'#title' => t('Chado Column'),
 		'#type' => 'select',
 		'#options' => array('stub'),
-		'#maxlength' => 128,
 		'#description' => 'Which Chado table column to use.',
 		'#required' => TRUE,
 	);
@@ -124,6 +137,34 @@ function tripal_views_setup_new_search_form(){
 	return $form;
 }
 
+// function rowmview_ahah(){
+	// $query = "SELECT mv_specs FROM tripal_mviews;";
+	// $row_options = db_fetch_array(db_query($query)); 
+// 	
+// 	
+// }
+
+// function tripal_views_setup_ajax_db_mview_columns(){
+	// $mview = $_POST['row_mview'];
+	// $form = drupal_get_form('tripal_views_setup_mview_column_form', $mview);
+	// drupal_json(array('status' => TRUE, 'data' => $form));
+// }
+
+// function tripal_views_setup_mview_column_form(&$form_state = NULL, $mview = NULL){
+	// if ($mview){
+		// $mview_query = db_fetch_array(db_query("SELECT mv_specs FROM tripal_mviews WHERE name = $mview;"));
+// 		
+		// $form['row_mview']
+	// }
+// 	
+// }
+
+// function tripal_views_setup_ajax_db_chado_tables(){
+// }
+
+
+
+
 function tripal_views_setup_new_search_form_submit($form, &$form_state){
 	
 }

+ 14 - 2
base/tripal_views_setup/tripal_views_setup.module

@@ -5,7 +5,6 @@ require_once 'includes/tripal_views_setup.admin.inc';
 function tripal_views_setup_menu(){
 	$items = array();
 	
-	//parents admin page TODO: figure out what to do here: add / remove searches
 	$items['admin/tripal/tripal_views_setup'] = array(
 	  'title' => t('Tripal Views Setups'),
 	  'description' => t('Tripal Views Setups settings page, allows you to select and create materialized views and chado tables to use for searches.'),
@@ -25,7 +24,20 @@ function tripal_views_setup_menu(){
      'type' => MENU_NORMAL_ITEM,
  	);
 	
-	// $items
+	
+	// $items['admin/tripal/tripal_views_setup_new/ajax/mview_column'] = array(
+		// 'title' => 'Get Mview Columns',
+		// 'page callback' => 'tripal_views_setup_ajax_db_mview_columns',
+		// 'access arguments' => array('access administration pages'),
+		// 'type' => MENU_CALLBACK,
+	// );
+	
+	// $items['admin/tripal/tripal_views_setup_new/ajax/base_table_name'] = array(
+		// 'title' => 'Get Chado Tables',
+		// 'page callback' => 'tripal_views_setup_ajax_db_chado_tables',
+		// 'access arguments' => array('access administration pages'),
+		// 'type' => MENU_CALLBACK,
+	// );
 	
 	return $items;
 }