Browse Source

Fixed PHP compatibility bug

Stephen Ficklin 9 years ago
parent
commit
720e6b3530

+ 2 - 1
tripal_chado/includes/fields/cvterm.inc

@@ -100,7 +100,8 @@ function tripal_chado_cvterm_widget(&$widget, $form, $form_state, $field,
   $base_table = $field['settings']['base_table'];
   $schema = chado_get_schema($chado_table);
   $pkey = $schema['primary key'][0];
-  $fkey = array_values($schema['foreign keys'][$base_table]['columns'])[0];
+  $fkeys = array_values($schema['foreign keys'][$base_table]['columns']);
+  $fkey = $fkeys[0];
 
   // Get the field defaults.
   $record_id = '';

+ 2 - 1
tripal_chado/includes/fields/pub.inc

@@ -59,7 +59,8 @@ function tripal_chado_pub_widget(&$widget, $form, $form_state, $field,
   $base_table = $field['settings']['base_table'];
   $schema = chado_get_schema($table_name);
   $pkey = $schema['primary key'][0];
-  $fkey = array_values($schema['foreign keys'][$base_table]['columns'])[0];
+  $fkeys = array_values($schema['foreign keys'][$base_table]['columns']);
+  $fkey = $fkeys[0];
 
   // Get the field defaults.
   $record_id = '';

+ 2 - 1
tripal_chado/includes/fields/synonym.inc

@@ -50,7 +50,8 @@ function tripal_chado_synonym_widget(&$widget, $form, $form_state, $field,
   $base_table = $field['settings']['base_table'];
   $schema = chado_get_schema($table_name);
   $pkey = $schema['primary key'][0];
-  $fkey = array_values($schema['foreign keys'][$base_table]['columns'])[0];
+  $fkeys = array_values($schema['foreign keys'][$base_table]['columns']);
+  $fkey = $fkeys[0];
 
   // Get the field defaults.
   $record_id = '';

+ 4 - 4
tripal_panes/theme/js/tripal_panes.js

@@ -2,12 +2,12 @@
 
   Drupal.behaviors.tripal_panes = {
     attach: function (context, settings){
-    
+
       // Add a close button for each pane
       $('.tripal_pane-fieldset .fieldset-legend').each(function (i) {
         $(this).append('<div class="tripal_pane-fieldset-close_button"><img src="' + panes_theme_dir + '/images/close_btn.png" id="tripal-panes-close-button" class="tripal-panes-button"></div>');
       });
-      
+
       // Hide the pane when the close button is clicked
       $('.tripal_pane-fieldset-close_button').each(function (i) {
         $(this).css('float', 'right');
@@ -21,7 +21,7 @@
           }
         });
       });
-      
+
       // Move the pane to the first when its TOC item is clicked.
       $('.tripal_panes-toc-list-item-link').each(function (i) {
         $(this).click(function() {
@@ -29,7 +29,7 @@
           $(id).removeClass('collapsed');
           $(id + ' .fieldset-wrapper').show();
           var prevObj = $(id).prev().attr('class');
-          
+
           // Highlight the pane if it's already at the top
           //if (prevObj.indexOf('tripal_pane-base_pane') == 0 && $(id).css('display') == 'block') {
           //  $(id).fadeTo(10, 0.5, function() {});