Merge branch '2036-claim_action_show_snackbar' of verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
gitea/salix/dev There was a failure building this commit
Details
This commit is contained in:
commit
ca94f03c58
|
@ -32,12 +32,11 @@ describe('Claim action path', () => {
|
||||||
expect(result).toEqual('Data saved!');
|
expect(result).toEqual('Data saved!');
|
||||||
});
|
});
|
||||||
|
|
||||||
// #2036 claim.action destinatario
|
|
||||||
it('should edit the second line destination field', async() => {
|
it('should edit the second line destination field', async() => {
|
||||||
await page.autocompleteSearch(selectors.claimAction.secondLineDestination, 'Bueno');
|
await page.autocompleteSearch(selectors.claimAction.secondLineDestination, 'Bueno');
|
||||||
// const result = await page.waitForLastSnackbar();
|
const result = await page.waitForLastSnackbar();
|
||||||
|
|
||||||
// expect(result).toEqual('Data saved!');
|
expect(result).toEqual('Data saved!');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should delete the first line', async() => {
|
it('should delete the first line', async() => {
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
<vn-crud-model vn-id="model" auto-load="true" auto-save="true"
|
<vn-crud-model vn-id="model"
|
||||||
url="ClaimEnds"
|
url="ClaimEnds"
|
||||||
filter="$ctrl.filter"
|
filter="$ctrl.filter"
|
||||||
data="$ctrl.salesClaimed">
|
data="$ctrl.salesClaimed"
|
||||||
|
auto-load="true"
|
||||||
|
auto-save="true"
|
||||||
|
on-save="$ctrl.onSave()">
|
||||||
</vn-crud-model>
|
</vn-crud-model>
|
||||||
|
|
||||||
<vn-crud-model auto-load="true"
|
<vn-crud-model auto-load="true"
|
||||||
|
|
|
@ -203,6 +203,10 @@ class Controller {
|
||||||
this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
|
this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onSave() {
|
||||||
|
this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Controller.$inject = ['$stateParams', '$scope', '$http', '$translate', 'vnApp', '$httpParamSerializer'];
|
Controller.$inject = ['$stateParams', '$scope', '$http', '$translate', 'vnApp', '$httpParamSerializer'];
|
||||||
|
|
Loading…
Reference in New Issue