Allow filter names with spaces

To do this now the filters have to explicitly specify a template name. It will no longer be inferred from the filter name.
biigle · Jun 16, 2016 · 018b4ed · 018b4ed
1 parent 1ca363f
commit 018b4ed
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 8 deletions.
diff --git a/src/public/assets/scripts/main.js b/src/public/assets/scripts/main.js
diff --git a/src/public/assets/styles/dashboard.css b/src/public/assets/styles/dashboard.css
diff --git a/src/public/assets/styles/dashboard.css.map b/src/public/assets/styles/dashboard.css.map
diff --git a/src/public/assets/styles/edit.css b/src/public/assets/styles/edit.css
diff --git a/src/public/assets/styles/edit.css.map b/src/public/assets/styles/edit.css.map
diff --git a/src/public/assets/styles/main.css b/src/public/assets/styles/main.css
diff --git a/src/public/assets/styles/main.css.map b/src/public/assets/styles/main.css.map
diff --git a/src/resources/assets/js/transects/services/filter.js b/src/resources/assets/js/transects/services/filter.js
@@ -77,6 +77,7 @@ angular.module('dias.transects').service('filter', function (TRANSECT_ID, TRANSE
             filters.push({
                 name: newFilter.name,
                 resource: newFilter.resource,
+                template: newFilter.template,
                 typeahead: newFilter.typeahead,
                 // add the transform function or use identity if there is none
                 transformData: newFilter.transformData || angular.identity

diff --git a/src/resources/views/index/menubar.blade.php b/src/resources/views/index/menubar.blade.php
@@ -41,7 +41,7 @@
 
         <ul class="filter-list list-group">
             <li class="list-group-item ng-cloak" data-ng-repeat="rule in getRules() | orderBy: '-'" data-ng-class="{'disabled': rule.ids.$resolved === false}">
-                <span data-ng-if="!rule.negate">has</span><span data-ng-if="rule.negate">has no</span> <span data-ng-include="rule.filter.name + 'FilterRule.html'"></span> <button type="button" class="close pull-right" title="Remove this rule" data-ng-click="removeRule(rule)"><span aria-hidden="true">&times;</span></button>
+                <span data-ng-if="!rule.negate">has</span><span data-ng-if="rule.negate">has no</span> <span data-ng-include="rule.filter.template"></span> <button type="button" class="close pull-right" title="Remove this rule" data-ng-click="removeRule(rule)"><span aria-hidden="true">&times;</span></button>
             </li>
             <li class="ng-cloak list-group-item text-muted" data-ng-if="!getRules().length">No filter rules</li>
         </ul>