Skip to content

Firefly III: a personal finances manager

Fix missing view.

James Cole6069b5cb02c6
diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.php
index 88c8bd7f29..6b52088e89 100644
--- a/app/Http/Controllers/Rule/SelectController.php
+++ b/app/Http/Controllers/Rule/SelectController.php
@@ -214,11 +214,8 @@ final class SelectController extends Controller
$warning = (string) trans('firefly.warning_no_matching_transactions');
}
- // Return json response
- $view = 'ERROR, see logs.';
-
try {
- $view = view('list.journals-array-tiny', ['groups' => $collection])->render();
+ $view = view('rules.rule.triggers-by-rule', ['groups' => $collection])->render();
} catch (Throwable $exception) {
$message = sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage());
Log::error($message);
diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php
index 77122093f6..df497489cd 100644
--- a/app/Http/Controllers/System/InstallController.php
+++ b/app/Http/Controllers/System/InstallController.php
@@ -54,7 +54,7 @@ final class InstallController extends Controller
public const string BASEDIR_ERROR = 'Firefly III cannot execute the upgrade commands. It is not allowed to because of an open_basedir restriction.';
public const string FORBIDDEN_ERROR = 'Internal PHP function "proc_close" is disabled for your installation. Auto-migration is not possible.';
- public const string OTHER_ERROR = 'An unknown error prevented Firefly III from executing the upgrade commands. Sorry.';
+ public const string OTHER_ERROR = 'An unknown error prevented Firefly III from executing the "%s"-command. Sorry.';
private string $lastError = '';
// empty on purpose.
@@ -122,7 +122,7 @@ final class InstallController extends Controller
$this->lastError = self::BASEDIR_ERROR;
}
$result = false;
- $this->lastError = sprintf('%s %s', self::OTHER_ERROR, $e->getMessage());
+ $this->lastError = sprintf('%s %s', sprintf(self::OTHER_ERROR, $command), $e->getMessage());
}
if (false === $result) {
$response['errorMessage'] = $this->lastError;
diff --git a/resources/views/rules/rule/triggers-by-rule.blade.php b/resources/views/rules/rule/triggers-by-rule.blade.php
new file mode 100644
index 0000000000..d962b377b5
--- /dev/null
+++ b/resources/views/rules/rule/triggers-by-rule.blade.php
@@ -0,0 +1,12 @@
+<div class="list-group">
+ @foreach($groups as $group)
+ @foreach($group['transactions'] as $transaction)
+ <a class="list-group-item" href="{{ route('transactions.show', [$transaction['transaction_group_id']]) }}">
+ {{ $transaction['description'] }}
+ <span class="text-end small">
+ X
+ </span>
+ </a>
+ @endforeach
+ @endforeach
+</div>