Quellcode durchsuchen

Small fixes to content creation.

Lacey Sanderson vor 7 Jahren
Ursprung
Commit
3bed705d41

+ 3 - 1
tripal/includes/TripalBundleUIController.inc

@@ -661,7 +661,7 @@ function tripal_admin_add_type_form_ajax_callback($form, $form_state) {
  */
 function tripal_admin_add_type_form_validate($form, &$form_state) {
   $stores = module_invoke_all('vocab_storage_info');
-  $store_select = $form_state['values']['store_select'];
+  $store_select = (isset($form_state['values']['store_select'])) ? $form_state['values']['store_select'] : NULL;
 
   if (array_key_exists('clicked_button', $form_state) and
       $form_state['clicked_button']['#name'] =='use_cvterm') {
@@ -768,6 +768,7 @@ function tripal_admin_add_type_form_submit($form, &$form_state) {
  * Checks access permissions for a given entity.
  */
 function tripal_admin_access($entity) {
+
   if ($entity) {
     $bundle_name = $entity->name;
   }
@@ -793,5 +794,6 @@ function tripal_admin_access($entity) {
   foreach($roles as $role => $value){
     user_role_change_permissions($role, $permission_for_role);
   }
+
   return TRUE;
 }

+ 2 - 2
tripal_chado/includes/tripal_chado.field_storage.inc

@@ -696,7 +696,7 @@ function tripal_chado_field_storage_query($query) {
 function tripal_chado_field_storage_bundle_mapping_form($form, &$form_state,
     $term, &$submit_disabled) {
 
-  $selected_term_id = $term->cvterm_id;
+  $selected_term_id = (is_object($term)) ? $term->cvterm_id : NULL;
 
   // Initialize the form.
   $form = array();
@@ -886,7 +886,7 @@ function tripal_chado_field_storage_bundle_mapping_form_add_type(&$form,
   // Get the list of columns in the default table.
   $schema = chado_get_schema($default['table']);
   $column_options = array('none' => '--None--');
-  $cvt_fkeys = array_keys($schema['foreign keys']['cvterm']['columns']);
+  $cvt_fkeys = (isset($schema['foreign keys']['cvterm'])) ? array_keys($schema['foreign keys']['cvterm']['columns']) : array();
   foreach ($schema['fields'] as $column_name => $column_details) {
     if (in_array($column_name, $cvt_fkeys)) {
       $column_options[$column_name] = $column_name;