update issue templates.

This commit is contained in:
James Cole
2020-03-25 19:25:50 +01:00
parent 5445752588
commit 84bdd47109
5 changed files with 19 additions and 8 deletions

View File

@@ -19,7 +19,7 @@ I am running Firefly III version x.x.x, and my problem is:
<!-- Earn bonus points by checking the boxes --> <!-- Earn bonus points by checking the boxes -->
- [ ] Nobody reported this bug before - [ ] Nobody reported this bug before
- [ ] I have added a stack trace from my log files. - [ ] I have added a stack trace from my log files <!-- (see https://bit.ly/FF3-get-debug-info) -->
- [ ] I have added a screenshot. - [ ] I have added a screenshot.
- [ ] I was able to replicate it on the demo site https://demo.firefly-iii.org/ - [ ] I was able to replicate it on the demo site https://demo.firefly-iii.org/
<!-- - [ ] I donated money (this is a joke :wink:)--> <!-- - [ ] I donated money (this is a joke :wink:)-->

View File

@@ -18,6 +18,6 @@ I am running Firefly III version x.x.x.
- [ ] I have read the FAQ at https://bit.ly/FF3-FAQ - [ ] I have read the FAQ at https://bit.ly/FF3-FAQ
- [ ] I added a screenshot - [ ] I added a screenshot
- [ ] I added log files (see https://bit.ly/FF3-get-logs) - [ ] I added log files <!-- (see https://bit.ly/FF3-get-debug-info) -->
- [ ] I was able to replicate the issue on the demo site. - [ ] I was able to replicate the issue on the demo site.
<!-- - [ ] I donated money (this is a joke :wink:)--> <!-- - [ ] I donated money (this is a joke :wink:)-->

View File

@@ -238,11 +238,12 @@ class ExportData extends Command
/** /**
* @throws FireflyException * @throws FireflyException
*
* @return string * @return string
*/ */
private function getExportDirectory(): string private function getExportDirectory(): string
{ {
$directory = $this->option('export_directory'); $directory = (string) $this->option('export_directory');
if (null === $directory) { if (null === $directory) {
$directory = './'; $directory = './';
} }

View File

@@ -50,6 +50,7 @@ class GracefulNotFoundHandler extends ExceptionHandler
* @param Request $request * @param Request $request
* @param Exception $exception * @param Exception $exception
* *
* @throws Exception
* @return mixed * @return mixed
*/ */
public function render($request, Exception $exception) public function render($request, Exception $exception)
@@ -137,9 +138,10 @@ class GracefulNotFoundHandler extends ExceptionHandler
* @param Request $request * @param Request $request
* @param Exception $exception * @param Exception $exception
* *
* @return \Illuminate\Http\Response|Response * @throws Exception
* @return Redirector|Response
*/ */
private function handleAccount($request, Exception $exception) private function handleAccount(Request $request, Exception $exception)
{ {
Log::debug('404 page is probably a deleted account. Redirect to overview of account types.'); Log::debug('404 page is probably a deleted account. Redirect to overview of account types.');
/** @var User $user */ /** @var User $user */
@@ -160,6 +162,13 @@ class GracefulNotFoundHandler extends ExceptionHandler
return redirect(route('accounts.index', [$shortType])); return redirect(route('accounts.index', [$shortType]));
} }
/**
* @param Request $request
* @param Exception $exception
*
* @throws Exception
* @return RedirectResponse|Redirector|Response
*/
private function handleAttachment(Request $request, Exception $exception) private function handleAttachment(Request $request, Exception $exception)
{ {
Log::debug('404 page is probably a deleted attachment. Redirect to parent object.'); Log::debug('404 page is probably a deleted attachment. Redirect to parent object.');
@@ -199,12 +208,13 @@ class GracefulNotFoundHandler extends ExceptionHandler
} }
/** /**
* @param $request * @param Request $request
* @param Exception $exception * @param Exception $exception
* *
* @throws Exception
* @return RedirectResponse|\Illuminate\Http\Response|Redirector|Response * @return RedirectResponse|\Illuminate\Http\Response|Redirector|Response
*/ */
private function handleGroup($request, Exception $exception) private function handleGroup(Request $request, Exception $exception)
{ {
Log::debug('404 page is probably a deleted group. Redirect to overview of group types.'); Log::debug('404 page is probably a deleted group. Redirect to overview of group types.');
/** @var User $user */ /** @var User $user */

View File

@@ -470,7 +470,7 @@ class TransactionJournalFactory
// return user's default: // return user's default:
return app('amount')->getDefaultCurrencyByUser($this->user); return app('amount')->getDefaultCurrencyByUser($this->user);
} }
$result = $preference ?? $currency; $result = ($preference ?? $currency) ?? app('amount')->getSystemCurrency();
Log::debug(sprintf('Currency is now #%d (%s) because of account #%d (%s)', $result->id, $result->code, $account->id, $account->name)); Log::debug(sprintf('Currency is now #%d (%s) because of account #%d (%s)', $result->id, $result->code, $account->id, $account->name));
return $result; return $result;