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

Fixes #508 Update category visibility after loading events

See merge request !45
merge-requests/49/head
Mike Koch 7 years ago
commit 0e04e44e1f

@ -68,7 +68,7 @@ while ($row = hesk_dbFetchAssoc($rs)) {
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;
}

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

Loading…
Cancel
Save