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

Rename variable.

Browse Source
This commit is contained in:
James Cole
2021-10-03 06:05:11 +02:00
parent 0a89af3c83
commit 1e0e5d0fe9
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Transaction/CreateController.php
View File

@@ -119,10 +119,10 @@ class CreateController extends Controller
$allowedOpposingTypes = config('firefly.allowed_opposing_types'); $allowedOpposingTypes = config('firefly.allowed_opposing_types');
$accountToTypes = config('firefly.account_to_transaction'); $accountToTypes = config('firefly.account_to_transaction');
$defaultCurrency = app('amount')->getDefaultCurrency(); $defaultCurrency = app('amount')->getDefaultCurrency();
$previousUri = $this->rememberPreviousUri('transactions.create.uri'); $previousUrl = $this->rememberPreviousUri('transactions.create.uri');
$parts = parse_url($previousUri); $parts = parse_url($previousUrl);
$search = sprintf('?%s', $parts['query'] ?? ''); $search = sprintf('?%s', $parts['query'] ?? '');
$previousUri = str_replace($search, '', $previousUri); $previousUrl = str_replace($search, '', $previousUrl);
session()->put('preFilled', $preFilled); session()->put('preFilled', $preFilled);
@@ -134,7 +134,7 @@ class CreateController extends Controller
'objectType', 'objectType',
'subTitle', 'subTitle',
'defaultCurrency', 'defaultCurrency',
'previousUri', 'previousUrl',
'optionalFields', 'optionalFields',
'preFilled', 'preFilled',
'allowedOpposingTypes', 'allowedOpposingTypes',

8
app/Http/Controllers/Transaction/EditController.php
View File

@@ -80,16 +80,16 @@ class EditController extends Controller
$defaultCurrency = app('amount')->getDefaultCurrency(); $defaultCurrency = app('amount')->getDefaultCurrency();
$cash = $repository->getCashAccount(); $cash = $repository->getCashAccount();
$previousUri = $this->rememberPreviousUri('transactions.edit.uri'); $previousUrl = $this->rememberPreviousUri('transactions.edit.uri');
$parts = parse_url($previousUri); $parts = parse_url($previousUrl);
$search = sprintf('?%s', $parts['query'] ?? ''); $search = sprintf('?%s', $parts['query'] ?? '');
$previousUri = str_replace($search, '', $previousUri); $previousUrl = str_replace($search, '', $previousUrl);
return prefixView( return prefixView(
'transactions.edit', 'transactions.edit',
compact( compact(
'cash', 'allowedSourceDests', 'expectedSourceTypes', 'transactionGroup', 'allowedOpposingTypes', 'accountToTypes', 'defaultCurrency', 'cash', 'allowedSourceDests', 'expectedSourceTypes', 'transactionGroup', 'allowedOpposingTypes', 'accountToTypes', 'defaultCurrency',
'previousUri' 'previousUrl'
) )
); );
} }

2
public/v1/js/create_transaction.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/edit_transaction.js vendored
View File

File diff suppressed because one or more lines are too long

4
resources/assets/js/components/transactions/CreateTransaction.vue
View File

@@ -519,8 +519,8 @@ export default {
let button = $('#submitButton'); let button = $('#submitButton');
button.removeAttr('disabled'); button.removeAttr('disabled');
} else { } else {
// console.log('Will redirect to previous URL. (' + previousUri + ')'); //console.log('Will redirect to previous URL. (' + previousUrl + ')');
window.location.href = window.previousUri + '?transaction_group_id=' + groupId + '&message=created'; window.location.href = window.previousUrl + '?transaction_group_id=' + groupId + '&message=created';
} }
}, },

4
resources/assets/js/components/transactions/EditTransaction.vue
View File

@@ -718,9 +718,9 @@ export default {
} }
} else { } else {
if (this.storeAsNew) { if (this.storeAsNew) {
window.location.href = window.previousUri + '?transaction_group_id=' + groupId + '&message=created'; window.location.href = window.previousUrl + '?transaction_group_id=' + groupId + '&message=created';
} else { } else {
window.location.href = window.previousUri + '?transaction_group_id=' + groupId + '&message=updated'; window.location.href = window.previousUrl + '?transaction_group_id=' + groupId + '&message=updated';
} }
} }
}, },

2
resources/views/v1/transactions/create.twig
View File

@@ -13,7 +13,7 @@
var accountToTypes = {{ accountToTypes|json_encode|raw }}; var accountToTypes = {{ accountToTypes|json_encode|raw }};
var defaultCurrency = {{ defaultCurrency.toArray()|json_encode|raw }}; var defaultCurrency = {{ defaultCurrency.toArray()|json_encode|raw }};
var cashAccountId = {{ cash.id }}; var cashAccountId = {{ cash.id }};
var previousUri = '{{ previousUri }}'; var previousUrl = '{{ previousUrl }}';
window.sourceId = {{ sourceId }}; window.sourceId = {{ sourceId }};
window.destinationId = {{ destinationId }}; window.destinationId = {{ destinationId }};
</script> </script>

2
resources/views/v1/transactions/edit.twig
View File

@@ -17,7 +17,7 @@
var allowedSourceDests = {{ allowedSourceDests|json_encode|raw }}; var allowedSourceDests = {{ allowedSourceDests|json_encode|raw }};
var expectedSourceTypes = {{ expectedSourceTypes|json_encode|raw }}; var expectedSourceTypes = {{ expectedSourceTypes|json_encode|raw }};
var cashAccountId = {{ cash.id }}; var cashAccountId = {{ cash.id }};
var previousUri = '{{ previousUri }}'; var previousUrl = '{{ previousUrl }}';
</script> </script>
{% endblock %} {% endblock %}