Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RFR] Do not update date field actual value if invalid #1334

Merged
merged 3 commits into from
Apr 3, 2017
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/javascripts/ng-admin/Crud/field/maDateField.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@ export default function maDateField() {
scope.rawValue = scope.value == null ? null : valueToRawValue(scope.value);

scope.$watch('rawValue', function(newRawValue) {
// ui bootstrap datepicker set value to undefined
// when the value is invalid and null if empty
const invalid = newRawValue === undefined;
Copy link
Contributor

@Kmaschta Kmaschta Apr 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you return if invalid before the field.parse?

const newValue = field.parse()(newRawValue);

if (!angular.equals(scope.value, newValue)) {
if (!angular.equals(scope.value, newValue) && !invalid) {
scope.value = newValue;
}
});
Expand Down