kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Replace uri with url

Browse Source
This commit is contained in:
James Cole
2022-04-12 18:19:30 +02:00
parent ac5c11a8d7
commit 50f87a210a
101 changed files with 449 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/v1/js/ff/recurring/edit.js vendored
View File

@@ -65,19 +65,19 @@ $(document).ready(function () {
function showRepCalendar() {
// pre-append URL with repetition info:
var newEventsUri = eventsUri + '?type=' + $('#ffInput_repetition_type').val();
newEventsUri += '&skip=' + $('#ffInput_skip').val();
newEventsUri += '&ends=' + $('#ffInput_repetition_end').val();
newEventsUri += '&end_date=' + $('#ffInput_repeat_until').val();
newEventsUri += '&reps=' + $('#ffInput_repetitions').val();
newEventsUri += '&first_date=' + $('#ffInput_first_date').val();
newEventsUri += '&weekend=' + $('#ffInput_weekend').val();
var newEventsUrl = eventsUrl + '?type=' + $('#ffInput_repetition_type').val();
newEventsUrl += '&skip=' + $('#ffInput_skip').val();
newEventsUrl += '&ends=' + $('#ffInput_repetition_end').val();
newEventsUrl += '&end_date=' + $('#ffInput_repeat_until').val();
newEventsUrl += '&reps=' + $('#ffInput_repetitions').val();
newEventsUrl += '&first_date=' + $('#ffInput_first_date').val();
newEventsUrl += '&weekend=' + $('#ffInput_weekend').val();
// remove all event sources from calendar:
calendar.fullCalendar('removeEventSources');
// add a new one:
calendar.fullCalendar('addEventSource', newEventsUri);
calendar.fullCalendar('addEventSource', newEventsUrl);
$('#calendarModal').modal('show');
return false;
@@ -117,7 +117,7 @@ function respondToFirstDateChange() {
preSelected = select.val();
}
$.getJSON(suggestUri, {date: date, pre_select: preSelected, past: true}).fail(function () {
$.getJSON(suggestUrl, {date: date, pre_select: preSelected, past: true}).fail(function () {
console.error('Could not load repetition suggestions');
alert('Could not load repetition suggestions');
}).done(parseRepetitionSuggestions);