verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

1781-zoneHoliday #994

Merged
joan merged 49 commits from 1781-zoneHoliday into dev 2022-08-03 06:41:31 +00:00
Conversation 1 Commits 49 Files Changed 20 +13 -11
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c7471fdac4 - Show all commits

24
modules/zone/front/events/index.js
View File

@ -72,25 +72,27 @@ class Controller extends Section {
else else
this.createInclusion(type, days, weekday); this.createInclusion(type, days, weekday);
} else { } else {
if (geoExclusions.length) if (geoExclusions.length) {
this.editExclusion(geoExclusions); this.geoExclusions = geoExclusions;
else if (exclusions.length) this.editExclusion();
this.editExclusion(exclusions); } else if (exclusions.length) {
else this.exclusions = exclusions;
this.editExclusion();
} else
this.createExclusion(days); this.createExclusion(days);
} }
} }
editExclusion(allTypeExclusions) { editExclusion() {
this.isNew = false; this.isNew = false;
this.excludeSelected = angular.copy(allTypeExclusions[0]);
if (this.excludeSelected.geoFk) { if (this.geoExclusions) {
this.excludeSelected = angular.copy(this.geoExclusions[0]);
this.excludeSelected.type = 'specificLocations'; this.excludeSelected.type = 'specificLocations';
this.geoExclusions = allTypeExclusions; }
} else { if (this.exclusions) {
this.excludeSelected = angular.copy(this.exclusions[0]);
this.excludeSelected.type = 'all'; this.excludeSelected.type = 'all';
this.exclusions = allTypeExclusions;
} }
this.$.excludeDialog.show(); this.$.excludeDialog.show();