Adding html_entity_decode() to enable series filter - #233

Author: bfren

src/classes/rota/filters/series-filter.class.php

@@ -3,6 +3,7 @@
 namespace Obadiah\Rota\Filters;
 
 use Obadiah\App;
+use Obadiah\Helpers\Log;
 use Obadiah\Lectionary\Lectionary;
 use Obadiah\Rota\Service;
 
@@ -32,6 +33,6 @@ public function apply(Lectionary $lectionary, Service $service, string $value):
         }
 
         // compare the series title with the value
-        return $l_service->series == $value;
+        return $l_service->series == html_entity_decode($value);
     }
 }

src/pages/rota/index-view.php

@@ -104,7 +104,7 @@
                 <span class="input-group-text" for="series">Series</span>
                 <select class="form-control" name="series">
                     <option value="">Choose...</option>
-                    <?php foreach ($model->series as $series) : $selected = $series == Arr::get($model->filters, "series") ? "selected" : ""; ?>
+                    <?php foreach ($model->series as $series) : $selected = $series == html_entity_decode(Arr::get($model->filters, "series")) ? "selected" : ""; ?>
                         <option value="<?php _e(htmlentities($series)); ?>" <?php _e($selected); ?>><?php _e($series); ?></option>
                     <?php endforeach; ?>
                 </select>