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
2020-09-29 08:58:50 +02:00
parent 7e988ff7a9 1de7abe9fd
commit 9004f35c65
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/schedule-2.0/public/build/fullcalendar.js
View File

@@ -44,7 +44,7 @@ document.addEventListener('DOMContentLoaded', function () {
weekNumbers: true, weekNumbers: true,
selectable: true, selectable: true,
events: 'event/load', events: 'event/load',
eventLimit: 4, eventLimit: 8,
eventDrop: function eventDrop(info) { eventDrop: function eventDrop(info) {
info.revert(); info.revert();
}, },

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

@@ -83,7 +83,7 @@
</label> </label>
<select class="select2entity" id="tasksubmit" name="tasksubmit"> <select class="select2entity" id="tasksubmit" name="tasksubmit">
<option></option> <option></option>
{% for task in tasks %} {% for task in tasks|sort((a, b) => a.displayname <=> b.displayname) %}
<option value="{{task.id}}">{{task.displayname}}</option> <option value="{{task.id}}">{{task.displayname}}</option>
{% endfor %} {% endfor %}
</select> </select>
@@ -169,7 +169,7 @@
</label> </label>
<select class="select2entity" id="taskupdate" name="taskupdate"> <select class="select2entity" id="taskupdate" name="taskupdate">
<option></option> <option></option>
{% for task in tasks %} {% for task in tasks|sort((a, b) => a.displayname <=> b.displayname) %}
<option value="{{task.id}}">{{task.displayname}}</option> <option value="{{task.id}}">{{task.displayname}}</option>
{% endfor %} {% endfor %}
</select> </select>