Merge pull request #803 from marmelab/fix_choices_14wq

Fix maChoiceField for Angular 1.4
marmelab · Nov 19, 2015 · 31ce30b · 31ce30b
2 parents caf78d5 + 2bbe237
commit 31ce30b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/javascripts/ng-admin/Crud/field/maChoiceField.js b/src/javascripts/ng-admin/Crud/field/maChoiceField.js
@@ -35,7 +35,7 @@ export default function maChoiceField($compile) {
                         itemsFilter = '';
                     }
 
-                    var choices = scope.choices() ? scope.choices : (field.choices ? field.choices() : []);
+                    var choices = (typeof scope.choices == 'function' && scope.choices()) ? scope.choices() : (field.choices ? field.choices() : []);
                     var attributes = field.attributes();
                     scope.placeholder = (attributes && attributes.placeholder) || 'Filter values';