Merge pull request #612 from marmelab/deselect

[RFR] Allow deselection to send null value in choice field
marmelab · Aug 24, 2015 · 9fb02d9 · 9fb02d9
2 parents bfa6cb0 + b1071d4
commit 9fb02d9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/javascripts/ng-admin/Crud/field/maChoiceField.js b/src/javascripts/ng-admin/Crud/field/maChoiceField.js
@@ -19,6 +19,12 @@ function maChoiceField($compile) {
                     var field = scope.field();
                     scope.name = field.name();
                     scope.v = field.validation();
+                    scope.$watch('value', function(newValue, oldValue) {
+                        if (newValue !== oldValue && newValue === undefined) {
+                            // fix for https://github.com/angular-ui/ui-select/issues/863
+                            scope.value = null;
+                        }
+                    });
 
                     var refreshAttributes = '';
                     if (field.type().indexOf('reference') === 0 && field.remoteComplete()) {

diff --git a/src/sass/ng-admin.scss b/src/sass/ng-admin.scss
@@ -202,6 +202,10 @@ div.bottom-loader {
 */
 .form-horizontal {
 
+    .has-feedback .form-control.ui-select-toggle {
+        padding-right: 12px;
+    }
+
     textarea {
         height: 150px;
     }