Merge pull request #103 from beluga-core/develop-5

Develop 5
qcovery · May 13, 2020 · 7f4827a · 7f4827a
2 parents 8e7b76a + a861c2a
commit 7f4827a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/module/ResultFeedback/src/ResultFeedback/Controller/ResultFeedbackController.php b/module/ResultFeedback/src/ResultFeedback/Controller/ResultFeedbackController.php
@@ -96,6 +96,11 @@ public function emailAction()
             $email_message .= $translator->translate('Email') . ':' . "\n" . $view->email . "\n\n";
             $email_message .= $translator->translate('PPN') . ':' . "\n" . $view->recordid . "\n\n";
             $email_message .= $translator->translate('Title') . ':' . "\n" . $view->recordtitle . "\n\n";
+
+            if (isset($resultFeedbackConfig['resultFeedback']['base_url_' . $searchClassId])) {
+              $email_message .= $translator->translate('Link') . ':' . "\n" . trim($resultFeedbackConfig['resultFeedback']['base_url_' . $searchClassId], '/') . '/' . $driver->getUniqueID() . "\n\n";
+            }
+
             $email_message .= $translator->translate('Message') . ':' . "\n" . $view->comments . "\n\n";
 
             // This sets up the email to be sent

diff --git a/themes/belugax/templates/Recommend/SideFacets/filter-list.phtml b/themes/belugax/templates/Recommend/SideFacets/filter-list.phtml
@@ -0,0 +1,30 @@
+<div class="facet-group active-filters">
+  <div class="title"><?=$this->transEsc('Remove Filters')?></div>
+  <?php foreach ($filterList as $field => $filters): ?>
+    <?php foreach ($filters as $i => $filter): ?>
+      <?php
+        $index = isset($filter['field']) ? array_search($filter['field'], $collapsedFacets) : false;
+        if ($index !== false) {
+          unset($collapsedFacets[$index]); // Open if we have a match
+        }
+        if (isset($filter['specialType']) && $filter['specialType'] == 'keyword') {
+          $removeLink = $this->currentPath() . $results->getUrlQuery()->replaceTerm($filter['value'], '');
+        } else {
+          $removeLink = $this->currentPath() . $results->getUrlQuery()->removeFacet($filter['field'], $filter['value'], $filter['operator']);
+        }
+        if ($filter['displayText'] == '[* TO *]') {
+          $filter['displayText'] = $this->translate('filter_wildcard');
+        }
+      ?>
+      <a class="facet" href="<?=$removeLink ?>" title="<?=$this->transEsc('clear_tag_filter') ?>">
+        <span class="sr-only"><?=$this->transEsc('clear_tag_filter') ?></span>
+        <span class="text">
+            <?php if ($filter['operator'] == 'NOT'): ?><?=$this->transEsc('NOT') ?><?php endif; ?>
+            <?php if ($filter['operator'] == 'OR' && $i > 0): ?><?=$this->transEsc('OR') ?><?php endif; ?>
+            <?=$this->transEsc($filter['field']) ?>: <?=$this->escapeHtml($filter['displayText']) ?>
+        </span>
+        <span class="status"><i class="fa fa-times" aria-hidden="true"></i></span>
+      </a>
+    <?php endforeach; ?>
+  <?php endforeach; ?>
+</div>