Browse Source

Fixed bug in ajaxifyPager function for FieldFormatter class

Stephen Ficklin 8 years ago
parent
commit
f45a5fb430
2 changed files with 5 additions and 2 deletions
  1. 5 2
      tripal/includes/TripalEntity.inc
  2. 0 0
      tripal/includes/tripal.field_storage.inc

+ 5 - 2
tripal/includes/TripalEntity.inc

@@ -173,11 +173,14 @@ class TripalFieldFormatter {
   protected function ajaxifyPager($pager, $entity) {
 
     global $base_path;
+dpm($pager);
+dpm($base_path);
 
     $tmp_base_path = preg_replace('/\//', '\/', $base_path);
     $field_id = 'tripal-entity-' . $entity->id . '--' . $this->field['field_name'];
-    $pager = preg_replace('/href="' . $tmp_base_path . 'bio_data\/ajax\/field_attach\/' . $field_id . '\?page=(.+?)"/', 'href="javascript:void(0)" onclick="tripal_navigate_field_pager(\'' . $field_id . '\', $1)"', $pager);
-    $pager = preg_replace('/href="' . $tmp_base_path . 'bio_data\/ajax\/field_attach\/' . $field_id . '"/', 'href="javascript:void(0)" onclick="tripal_navigate_field_pager(\'' . $field_id . '\', 0)"', $pager);
+
+    $pager = preg_replace('/href="\/.+\?page=(.+?)"/', 'href="javascript:void(0)" onclick="tripal_navigate_field_pager(\'' . $field_id . '\', $1)"', $pager);
+    $pager = preg_replace('/href="\/.+"/', 'href="javascript:void(0)" onclick="tripal_navigate_field_pager(\'' . $field_id . '\', 0)"', $pager);
 
     $pager = '<img src="/' . drupal_get_path('module', 'tripal') . '/theme/images/ajax-loader.gif" id="' . $field_id . '-spinner" class="tripal-field-ajax-spinner">' . $pager;
     return $pager;

+ 0 - 0
tripal/includes/tripal.field_storage.inc