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

fix: show correct css
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Vicent Llopis 2022-06-01 13:47:46 +02:00
parent c7471fdac4
commit 1235affe2d
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/zone/front/calendar/index.js
View File

@ -173,9 +173,9 @@ class Controller extends Component {
getClass(day) { getClass(day) {
let stamp = day.getTime(); let stamp = day.getTime();
if (this.geoExclusions[stamp] && !this.days[stamp]) if (this.geoExclusions[stamp])
return 'geoExcluded'; return 'geoExcluded';
else if (this.exclusions[stamp] && !this.days[stamp]) else if (this.exclusions[stamp])
return 'excluded'; return 'excluded';
else return ''; else return '';
} }

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

@ -85,12 +85,11 @@ class Controller extends Section {
editExclusion() { editExclusion() {
this.isNew = false; this.isNew = false;
if (this.geoExclusions && this.geoExclusions.length) {
if (this.geoExclusions) {
this.excludeSelected = angular.copy(this.geoExclusions[0]); this.excludeSelected = angular.copy(this.geoExclusions[0]);
this.excludeSelected.type = 'specificLocations'; this.excludeSelected.type = 'specificLocations';
} }
if (this.exclusions) { if (this.exclusions && this.exclusions.length) {
this.excludeSelected = angular.copy(this.exclusions[0]); this.excludeSelected = angular.copy(this.exclusions[0]);
this.excludeSelected.type = 'all'; this.excludeSelected.type = 'all';
} }
@ -244,7 +243,6 @@ class Controller extends Section {
geoIds: geoIds geoIds: geoIds
}; };
console.log(excludeSelected);
if (this.isNew) if (this.isNew)
req = this.$http.post(this.geoExclusionsPath, params); req = this.$http.post(this.geoExclusionsPath, params);
else else
@ -269,7 +267,12 @@ class Controller extends Section {
} }
this.$q.all(reqs) this.$q.all(reqs)
.then(() => this.refresh()); .then(() => {
this.excludeSelected = null;
this.geoExclusions = null;
this.exclusions = null;
this.refresh();
});
} }
set excludeSearch(value) { set excludeSearch(value) {