Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop

* 'develop' of https://github.com/firefly-iii/firefly-iii:
  remove first slash in mass transaction changes
- Fix user event handler test
- Fix 404 view
This commit is contained in:
James Cole
2018-09-23 07:39:31 +02:00
3 changed files with 19 additions and 10 deletions

View File

@@ -67,7 +67,7 @@ function goToMassEdit() {
baseHref = bases[0].href;
}
window.location.href = baseHref + '/transactions/mass/edit/' + checkedArray;
window.location.href = baseHref + 'transactions/mass/edit/' + checkedArray;
return false;
}
@@ -87,7 +87,7 @@ function goToBulkEdit() {
baseHref = bases[0].href;
}
window.location.href = baseHref + '/transactions/bulk/edit/' + checkedArray;
window.location.href = baseHref + 'transactions/bulk/edit/' + checkedArray;
return false;
}
@@ -106,7 +106,7 @@ function goToMassDelete() {
if (bases.length > 0) {
baseHref = bases[0].href;
}
window.location.href = baseHref + '/transactions/mass/delete/' + checkedArray;
window.location.href = baseHref + 'transactions/mass/delete/' + checkedArray;
return false;
}
@@ -229,4 +229,4 @@ function startMassSelect() {
$('.mass_reconcile').hide();
return false;
}
}