Merge branch 'master' of github.com:rdmorganiser/rdmo

rdmorganiser · Apr 6, 2017 · 536f003 · 536f003
2 parents 737872c + 775a596
commit 536f003
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/apps/conditions/static/conditions/js/conditions.js b/apps/conditions/static/conditions/js/conditions.js
@@ -112,8 +112,12 @@ angular.module('conditions', ['core'])
 
     service.getOptions = function() {
         if (angular.isDefined(service.values) && angular.isDefined(service.values.source)) {
-            attribute = $filter('filter')(service.attributes, {id: service.values.source})[0];
-            return attribute.options;
+            var attributes = $filter('filter')(service.attributes, {id: service.values.source});
+            for (var i = 0; i < attributes.length; i++) {
+                if (attributes[i].id == service.values.source) {
+                    return attributes[i].options;
+                }
+            }
         }
     };