Cadoles/schedule
21
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arnaud Fornerot
2021-05-03 10:01:28 +02:00
parent 00a55a9e67 a9c8825dfa
commit 4b60db6daf
3 changed files with 73 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/schedule-2.0/assets/js/fullcalendar.js
View File

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

2
src/schedule-2.0/templates/Event/list.html.twig
View File

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

2
src/schedule-2.0/templates/base.html.twig
View File

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