Add validate information on wizard Button

issue8571
review260041002
This commit is contained in:
Nicolas Évrard
2019-11-21 15:39:56 +01:00
parent c0a592ec1f
commit ebe6b9fc9b
2 changed files with 16 additions and 16 deletions
+1
View File
@@ -1,3 +1,4 @@
* Support validate attribute of wizard's Button
* Add infinite scroll
Version 5.4.0 - 2019-11-04
+15 -16
View File
@@ -127,20 +127,19 @@
this.widget.empty();
this.states = {};
},
response: function(state) {
response: function(definition) {
this.__waiting_response = false;
this.screen.current_view.set_value();
return this.screen.current_record.validate().then(function(validate) {
if ((!validate) && state != this.end_state) {
this.screen.display(true);
this.info_bar.message(
this.screen.invalid_message(), 'danger');
return;
}
this.info_bar.message();
this.state = state;
this.process();
}.bind(this));
if (definition.validate && this.screen.current_record.validate(
null, null, null, true)) {
this.screen.display(true);
this.info_bar.message(
this.screen.invalid_message(), 'danger');
return;
}
this.info_bar.message();
this.state = definition.state;
this.process();
},
_get_button: function(definition) {
var button = new Sao.common.Button(definition);
@@ -213,7 +212,7 @@
definition);
this.footer.append(button.el);
button.el.click(function() {
this.response(definition.state);
this.response(definition);
}.bind(this));
return button;
},
@@ -250,7 +249,7 @@
if (e.which == Sao.common.ESC_KEYCODE) {
e.preventDefault();
if (this.end_state in this.states) {
this.response(this.end_state);
this.response(this.states[this.end_state].attributes);
}
}
}.bind(this));
@@ -268,13 +267,13 @@
if (definition['default']) {
this.content.unbind('submit');
this.content.submit(function(e) {
this.response(definition.state);
this.response(definition);
e.preventDefault();
}.bind(this));
button.el.attr('type', 'submit');
} else {
button.el.click(function() {
this.response(definition.state);
this.response(definition);
}.bind(this));
}
return button;