Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '508-calendar-select-deselect' into '3-0-4'

Browse Source 
Fixes #508 Update category visibility after loading events

See merge request !45
This commit is contained in:
Mike Koch 2017-03-28 01:00:20 +00:00
commit 0e04e44e1f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/calendar.php
View File

@ -68,7 +68,7 @@ while ($row = hesk_dbFetchAssoc($rs)) {
continue; continue;
} }
$row['css_style'] = $row['color'] == null ? 'color: black; border: solid 1px #000;' : 'border: solid 1px ' . $row['color'] . '; background: ' . $row['color']; $row['css_style'] = $row['color'] == null ? 'background: white; color: black; border: solid 1px #000;' : 'border: solid 1px ' . $row['color'] . '; background: ' . $row['color'];
$categories[] = $row; $categories[] = $row;
} }

2
js/calendar/mods-for-hesk-calendar.js
View File

@ -22,9 +22,9 @@ $(document).ready(function() {
events.push(buildEvent(this.id, this)); events.push(buildEvent(this.id, this));
}); });
callback(events); callback(events);
updateCategoryVisibility();
}, },
error: function(data) { error: function(data) {
console.error(data);
$.jGrowl($('#lang_error_loading_events').text(), { theme: 'alert-danger', closeTemplate: '' }); $.jGrowl($('#lang_error_loading_events').text(), { theme: 'alert-danger', closeTemplate: '' });
} }
}); });