Skip to content
Snippets Groups Projects
Commit 8c92831b authored by François Grand's avatar François Grand
Browse files

fix: form validity not updated after closing variable mode parameter dialog

refs #610
parent 536b449e
No related branches found
No related tags found
2 merge requests!225Release v4.17.0,!212Resolve "Courbe de remous : rendre facultatif l'une des deux conditions limites en cote"
...@@ -265,7 +265,7 @@ export class FieldSetComponent implements DoCheck { ...@@ -265,7 +265,7 @@ export class FieldSetComponent implements DoCheck {
* réception d'un événement de validité de ParamFieldLineComponent * réception d'un événement de validité de ParamFieldLineComponent
*/ */
public onParamLineValid(event: boolean) { public onParamLineValid(event: boolean) {
this.updateValidity(); this.updateValidity(true);
} }
/** /**
......
...@@ -119,9 +119,10 @@ export abstract class GenericInputComponentDirective implements OnChanges { ...@@ -119,9 +119,10 @@ export abstract class GenericInputComponentDirective implements OnChanges {
*/ */
private setAndEmitValid() { private setAndEmitValid() {
this._isValid.value = this._isValidUI && this._isValidModel; this._isValid.value = this._isValidUI && this._isValidModel;
if (this._isValid.changed) { // if (this._isValid.changed)
this.change.emit({ "action": "valid", "value": this._isValid.value }); // {
} this.change.emit({ "action": "valid", "value": this._isValid.value });
// }
} }
/** /**
......
...@@ -347,6 +347,10 @@ export class ParamFieldLineComponent implements OnChanges { ...@@ -347,6 +347,10 @@ export class ParamFieldLineComponent implements OnChanges {
case "cancelvar": // cancel button clicked in DialogEditParamValuesComponent case "cancelvar": // cancel button clicked in DialogEditParamValuesComponent
this.param.loadObjectRepresentation(this.paramBackup); this.param.loadObjectRepresentation(this.paramBackup);
break; break;
case "okvar":
this.emitValidity();
break;
} }
} }
......
...@@ -74,6 +74,10 @@ export class ParamValuesComponent implements AfterViewInit, Observer { ...@@ -74,6 +74,10 @@ export class ParamValuesComponent implements AfterViewInit, Observer {
this.change.emit({ this.change.emit({
action: "cancelvar" action: "cancelvar"
}); });
} else {
this.change.emit({
action: "okvar"
});
} }
}); });
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment