Merge pull request #686 from cosmocode/jump

Add anchor to agrregations and dynamic filters

Author: annda

meta/Aggregation.php

@@ -119,7 +119,11 @@ public function startScope()
     {
         if ($this->mode == 'xhtml') {
             $classes = $this->getScopeClasses();
-            $this->renderer->doc .= '<div class="' . implode(' ', $classes) . '">';
+
+            $hash = $this->renderer->info['struct_table_hash'] ?? '';
+            $id = $hash ? " id=\"$hash\" " : '';
+
+            $this->renderer->doc .= '<div ' . $id . 'class="' . implode(' ', $classes) . '">';
         }
     }
 

meta/AggregationEditorTable.php

@@ -28,7 +28,8 @@ public function render($showNotFound = false)
     public function startScope()
     {
         // unique identifier for this aggregation
-        $this->renderer->info['struct_table_hash'] = md5(var_export($this->data, true));
+        $hash = md5(var_export($this->data, true));
+        $this->renderer->info['struct_table_hash'] = $hash;
 
         if ($this->mode != 'xhtml') return;
 
@@ -42,11 +43,9 @@ public function startScope()
         $classes = $this->getScopeClasses();
         $classes[] = 'structaggregationeditor';
         $classes = implode(' ', $classes);
-        $this->renderer->doc .= "<div class=\"$classes\" 
+        $this->renderer->doc .= "<div id=\"$hash\"
+                                      class=\"$classes\"
                                       data-schema=\"$table\" data-searchconf=\"$config\">";
-
-        // unique identifier for this aggregation
-        $this->renderer->info['struct_table_hash'] = md5(var_export($this->data, true));
     }
 
     /**

meta/AggregationTable.php

@@ -281,7 +281,12 @@ protected function renderDynamicFilters()
             $this->renderer->doc .= '<th>';
 
             // BEGIN FORM
-            $form = new \Doku_Form(['method' => 'GET', 'action' => wl($this->id)]);
+            $form = new \Doku_Form(
+                [
+                    'method' => 'GET',
+                    'action' => wl($this->id, $this->renderer->info['struct_table_hash'], false, '#')
+                ]
+            );
             unset($form->_hidden['sectok']); // we don't need it here
             if (!$conf['userewrite']) $form->addHidden('id', $this->id);