Merge branch '7.x-3.x' of github.com:tripal/tripal into 7.x-3.x

tripal_chado/tripal_chado.install

@@ -306,6 +306,9 @@ function tripal_chado_upgrade_v2_v3_pre_enable() {
     if (db_query("SELECT 1 FROM pg_indexes WHERE indexname = 'tripal_cv_obo_obo_id_idx'")->fetchField()) {
       $sql = "ALTER INDEX tripal_cv_obo_obo_id_idx RENAME TO tripal_cv_obo_obo_id_idx2";
     }
+    else if (db_query("SELECT 1 FROM pg_indexes WHERE indexname = 'tripal_cv_obo_tripal_cv_obo_idx1_idx'")->fetchField()) {
+      $sql = "ALTER INDEX tripal_cv_obo_tripal_cv_obo_idx1_idx RENAME TO tripal_cv_obo_obo_id_idx2";
+    }
     else {
       $sql = "CREATE INDEX tripal_cv_obo_obo_id_idx2 ON tripal_cv_obo2 USING btree (obo_id)";
     }
@@ -313,9 +316,6 @@ function tripal_chado_upgrade_v2_v3_pre_enable() {
     if (db_query("SELECT 1 FROM pg_indexes WHERE indexname = 'tripal_cv_obo_pkey'")->fetchField()) {
       $sql = "ALTER INDEX tripal_cv_obo_pkey RENAME TO tripal_cv_obo_pkey2";
     }
-    else if (db_query("SELECT 1 FROM pg_indexes WHERE indexname = 'tripal_cv_obo_tripal_cv_obo_idx1_idx'")->fetchField()) {
-      $sql = "ALTER INDEX tripal_cv_obo_tripal_cv_obo_idx1_idx RENAME TO tripal_cv_obo_tripal_cv_obo_idx1_idx2";
-    }
     else {
       $sql = "CREATE UNIQUE INDEX tripal_cv_obo_pkey2 ON tripal_cv_obo2 USING btree (obo_id)";
     }
@@ -389,9 +389,6 @@ function tripal_chado_upgrade_v2_v3_enable() {
     if (db_query("SELECT 1 FROM pg_indexes WHERE indexname = 'tripal_cv_obo_pkey2'")->fetchField()) {
       $sql = "ALTER INDEX tripal_cv_obo_pkey2 RENAME TO tripal_cv_obo_pkey";
     }
-    else {
-      $sql = "ALTER INDEX tripal_cv_obo_tripal_cv_obo_idx1_idx2 RENAME TO tripal_cv_obo_tripal_cv_obo_idx1_idx";
-    }
     db_query($sql);
   }
 
@@ -1031,4 +1028,4 @@ function tripal_chado_update_7307() {
     $error = $e->getMessage();
     throw new DrupalUpdateException('Could not perform update: '. $error);
   }
-}
+}

tripal_ds/includes/tripal_ds.ds.inc

@@ -133,11 +133,15 @@ function _ds_layout_settings_info($bundle_name, $instances) {
 
     // Build one large multidimensional array of all instances to sort in alpha
     // order to display fields in label alpha order.
+    $right_fields = array();
     $all_field_groups = field_group_info_groups('TripalEntity', $bundle_name);
-    foreach ($all_field_groups['default'] as $key => $field_name) {
-      $right_fields[$key] = $field_name;
+    if (is_array($all_field_groups)) {
+      if (!isset($all_field_groups['default'])) { $all_field_groups['default'] = array(); }
+      foreach ($all_field_groups['default'] as $key => $field_name) {
+        $right_fields[$key] = $field_name;
+      }
+      usort($right_fields, sort_object('label'));
     }
-    usort($right_fields, sort_object('label'));
 
     // Now build the $region_right array and the fields array.
     $i = 0;