jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

go back to calendar after editing and creation of time-records (#519)

Browse Source
This commit is contained in:
Kevin Papst
2019-01-23 17:30:45 +01:00
committed by GitHub
parent ee32d6f926
commit 572f01ed74
9 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/calendar/user.html.twig
View File

@@ -91,10 +91,10 @@
});
},
eventClick: function(calEvent, jsEvent, view) {
location.href = '{{ path('timesheet_edit', {id: '-XX-'}) }}'.replace('-XX-', calEvent.id);
location.href = '{{ path('timesheet_edit', {id: '-XX-'}) }}?origin=calendar'.replace('-XX-', calEvent.id);
},
dayClick: function(date, jsEvent, view) {
location.href = '{{ path('timesheet_create') }}' + '?begin=' + date.format();
location.href = '{{ path('timesheet_create') }}' + '?origin=calendar&begin=' + date.format();
},
selectable: true,
select: function( start, end, jsEvent, view) {