Merge branch 'master' into dist/eole/2.7.2/master

This commit is contained in:
2021-05-03 10:01:28 +02:00
3 changed files with 73 additions and 70 deletions

View File

@@ -18,7 +18,10 @@ document.addEventListener('DOMContentLoaded', function() {
locale: frLocale,
weekNumbers: true,
selectable: true,
events: 'event/load/'+iduser,
eventSources: [{
'id': 1,
'url': 'event/load/'+iduser,
}],
eventLimit:8,
eventDrop: function(info) {
info.revert();

View File

@@ -453,7 +453,7 @@ function eventSubmit() {
$("#modalsubmit .modal-body").append("<div class='alert alert-danger' style='margin: 5px 0px'>"+response.error+"</div>");
}
else {
calendar.addEvent(response);
calendar.addEvent(response,1);
calendar.render;
$('#modalsubmit').modal('hide');
}

View File

@@ -321,7 +321,7 @@
<div class="select-control">
<select class="form-control select2entity" id="sideproject" name="sideproject">
<option value="all" selected>Tous les projets</option>
{% for project in app.session.get('projects') %}
{% for project in app.session.get('projects')|sort((a, b) => a.displayname <=> b.displayname) %}
{% set selected="" %}
{%if project.id==app.session.get('idproject') %}
{% set selected="selected" %}