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

4
app/Http/Controllers/Transaction/BulkController.php
View File

@@ -76,7 +76,7 @@ class BulkController extends Controller
{
$subTitle = (string) trans('firefly.mass_bulk_journals');
$this->rememberPreviousUri('transactions.bulk-edit.uri');
$this->rememberPreviousUrl('transactions.bulk-edit.url');
// make amounts positive.
@@ -121,7 +121,7 @@ class BulkController extends Controller
$request->session()->flash('success', (string) trans_choice('firefly.mass_edited_transactions_success', $count));
// redirect to previous URL:
return redirect($this->getPreviousUri('transactions.bulk-edit.uri'));
return redirect($this->getPreviousUrl('transactions.bulk-edit.url'));
}
/**

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

@@ -121,7 +121,7 @@ class CreateController extends Controller
$allowedOpposingTypes = config('firefly.allowed_opposing_types');
$accountToTypes = config('firefly.account_to_transaction');
$defaultCurrency = app('amount')->getDefaultCurrency();
$previousUrl = $this->rememberPreviousUri('transactions.create.uri');
$previousUrl = $this->rememberPreviousUrl('transactions.create.url');
$parts = parse_url($previousUrl);
$search = sprintf('?%s', $parts['query'] ?? '');
$previousUrl = str_replace($search, '', $previousUrl);

6
app/Http/Controllers/Transaction/DeleteController.php
View File

@@ -85,8 +85,8 @@ class DeleteController extends Controller
$subTitle = (string) trans('firefly.delete_' . $objectType, ['description' => $group->title ?? $journal->description]);
$previous = app('steam')->getSafePreviousUrl(route('index'));
// put previous url in session
Log::debug('Will try to remember previous URI');
$this->rememberPreviousUri('transactions.delete.uri');
Log::debug('Will try to remember previous URL');
$this->rememberPreviousUrl('transactions.delete.url');
return view('transactions.delete', compact('group', 'journal', 'subTitle', 'objectType', 'previous'));
}
@@ -115,6 +115,6 @@ class DeleteController extends Controller
app('preferences')->mark();
return redirect($this->getPreviousUri('transactions.delete.uri'));
return redirect($this->getPreviousUrl('transactions.delete.url'));
}
}

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

@@ -80,7 +80,7 @@ class EditController extends Controller
$defaultCurrency = app('amount')->getDefaultCurrency();
$cash = $repository->getCashAccount();
$previousUrl = $this->rememberPreviousUri('transactions.edit.uri');
$previousUrl = $this->rememberPreviousUrl('transactions.edit.url');
$parts = parse_url($previousUrl);
$search = sprintf('?%s', $parts['query'] ?? '');
$previousUrl = str_replace($search, '', $previousUrl);

4
app/Http/Controllers/Transaction/LinkController.php
View File

@@ -76,7 +76,7 @@ class LinkController extends Controller
{
$subTitleIcon = 'fa-link';
$subTitle = (string) trans('breadcrumbs.delete_journal_link');
$this->rememberPreviousUri('journal_links.delete.uri');
$this->rememberPreviousUrl('journal_links.delete.url');
return view('transactions.links.delete', compact('link', 'subTitle', 'subTitleIcon'));
}
@@ -95,7 +95,7 @@ class LinkController extends Controller
session()->flash('success', (string) trans('firefly.deleted_link'));
app('preferences')->mark();
return redirect((string) session('journal_links.delete.uri'));
return redirect((string) session('journal_links.delete.url'));
}
/**

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

@@ -82,7 +82,7 @@ class MassController extends Controller
$subTitle = (string) trans('firefly.mass_delete_journals');
// put previous url in session
$this->rememberPreviousUri('transactions.mass-delete.uri');
$this->rememberPreviousUrl('transactions.mass-delete.url');
return view('transactions.mass.delete', compact('journals', 'subTitle'));
}
@@ -115,7 +115,7 @@ class MassController extends Controller
session()->flash('success', (string) trans_choice('firefly.mass_deleted_transactions_success', $count));
// redirect to previous URL:
return redirect($this->getPreviousUri('transactions.mass-delete.uri'));
return redirect($this->getPreviousUrl('transactions.mass-delete.url'));
}
/**
@@ -151,7 +151,7 @@ class MassController extends Controller
null : app('steam')->positive($journal['foreign_amount']);
}
$this->rememberPreviousUri('transactions.mass-edit.uri');
$this->rememberPreviousUrl('transactions.mass-edit.url');
return view('transactions.mass.edit', compact('journals', 'subTitle', 'withdrawalSources', 'depositDestinations', 'budgets'));
}
@@ -187,7 +187,7 @@ class MassController extends Controller
session()->flash('success', (string) trans_choice('firefly.mass_edited_transactions_success', $count));
// redirect to previous URL:
return redirect($this->getPreviousUri('transactions.mass-edit.uri'));
return redirect($this->getPreviousUrl('transactions.mass-edit.url'));
}
/**