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

Make it easier to switch between v1/v2 layout.

Browse Source
This commit is contained in:
James Cole
2021-02-03 06:25:46 +01:00
parent 957e34a57a
commit 08fcff2a98
12 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Support/Http/Controllers/ModelInformation.php
View File

@@ -48,7 +48,7 @@ trait ModelInformation
protected function getActionsForBill(Bill $bill): array // get info and augument
{
try {
$result = view(
$result = prefixView(
'rules.partials.action',
[
'oldAction' => 'link_to_bill',
@@ -139,7 +139,7 @@ trait ModelInformation
];
foreach ($billTriggers as $index => $trigger) {
try {
$string = view(
$string = prefixView(
'rules.partials.trigger',
[
'oldTrigger' => $trigger,
@@ -257,7 +257,7 @@ trait ModelInformation
foreach ($journalTriggers as $index => $trigger) {
try {
$string = view(
$string = prefixView(
'rules.partials.trigger',
[
'oldTrigger' => $trigger,

24
app/Support/Http/Controllers/RenderPartialViews.php
View File

@@ -78,7 +78,7 @@ trait RenderPartialViews
// @codeCoverageIgnoreStart
try {
$result = view('reports.options.double', compact('set'))->render();
$result = prefixView('reports.options.double', compact('set'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Cannot render reports.options.tag: %s', $e->getMessage()));
$result = 'Could not render view.';
@@ -111,7 +111,7 @@ trait RenderPartialViews
$journals = $popupHelper->balanceForBudget($budget, $account, $attributes);
// @codeCoverageIgnoreStart
try {
$view = view('popup.report.balance-amount', compact('journals', 'budget', 'account'))->render();
$view = prefixView('popup.report.balance-amount', compact('journals', 'budget', 'account'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Could not render: %s', $e->getMessage()));
$view = 'Firefly III could not render the view. Please see the log files.';
@@ -134,7 +134,7 @@ trait RenderPartialViews
$budgets = $repository->getBudgets();
// @codeCoverageIgnoreStart
try {
$result = view('reports.options.budget', compact('budgets'))->render();
$result = prefixView('reports.options.budget', compact('budgets'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Cannot render reports.options.tag: %s', $e->getMessage()));
$result = 'Could not render view.';
@@ -167,7 +167,7 @@ trait RenderPartialViews
$journals = $popupHelper->byBudget($budget, $attributes);
// @codeCoverageIgnoreStart
try {
$view = view('popup.report.budget-spent-amount', compact('journals', 'budget'))->render();
$view = prefixView('popup.report.budget-spent-amount', compact('journals', 'budget'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Could not render: %s', $e->getMessage()));
$view = 'Firefly III could not render the view. Please see the log files.';
@@ -196,7 +196,7 @@ trait RenderPartialViews
$journals = $popupHelper->byCategory($category, $attributes);
try {
$view = view('popup.report.category-entry', compact('journals', 'category'))->render();
$view = prefixView('popup.report.category-entry', compact('journals', 'category'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Could not render: %s', $e->getMessage()));
$view = 'Firefly III could not render the view. Please see the log files.';
@@ -217,7 +217,7 @@ trait RenderPartialViews
$categories = $repository->getCategories();
// @codeCoverageIgnoreStart
try {
$result = view('reports.options.category', compact('categories'))->render();
$result = prefixView('reports.options.category', compact('categories'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Cannot render reports.options.category: %s', $e->getMessage()));
$result = 'Could not render view.';
@@ -252,7 +252,7 @@ trait RenderPartialViews
$journals = $popupHelper->byExpenses($account, $attributes);
// @codeCoverageIgnoreStart
try {
$view = view('popup.report.expense-entry', compact('journals', 'account'))->render();
$view = prefixView('popup.report.expense-entry', compact('journals', 'account'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Could not render: %s', $e->getMessage()));
$view = 'Firefly III could not render the view. Please see the log files.';
@@ -280,7 +280,7 @@ trait RenderPartialViews
foreach ($currentActions as $entry) {
$count = ($index + 1);
try {
$actions[] = view(
$actions[] = prefixView(
'rules.partials.action',
[
'oldAction' => $entry->action_type,
@@ -332,7 +332,7 @@ trait RenderPartialViews
if ('user_action' !== $entry->trigger_type) {
$count = ($index + 1);
try {
$renderedEntries[] = view(
$renderedEntries[] = prefixView(
'rules.partials.trigger',
[
'oldTrigger' => OperatorQuerySearch::getRootOperator($entry->trigger_type),
@@ -378,7 +378,7 @@ trait RenderPartialViews
$journals = $popupHelper->byIncome($account, $attributes);
// @codeCoverageIgnoreStart
try {
$view = view('popup.report.income-entry', compact('journals', 'account'))->render();
$view = prefixView('popup.report.income-entry', compact('journals', 'account'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Could not render: %s', $e->getMessage()));
$view = 'Firefly III could not render the view. Please see the log files.';
@@ -398,7 +398,7 @@ trait RenderPartialViews
{
// @codeCoverageIgnoreStart
try {
$result = view('reports.options.no-options')->render();
$result = prefixView('reports.options.no-options')->render();
} catch (Throwable $e) {
Log::error(sprintf('Cannot render reports.options.no-options: %s', $e->getMessage()));
$result = 'Could not render view.';
@@ -422,7 +422,7 @@ trait RenderPartialViews
// @codeCoverageIgnoreStart
try {
$result = view('reports.options.tag', compact('tags'))->render();
$result = prefixView('reports.options.tag', compact('tags'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Cannot render reports.options.tag: %s', $e->getMessage()));
$result = 'Could not render view.';

6
app/Support/Http/Controllers/RuleManagement.php
View File

@@ -57,7 +57,7 @@ trait RuleManagement
$index = 0;
foreach ($submittedOperators as $operator) {
try {
$renderedEntries[] = view(
$renderedEntries[] = prefixView(
'rules.partials.trigger',
[
'oldTrigger' => OperatorQuerySearch::getRootOperator($operator['type']),
@@ -140,7 +140,7 @@ trait RuleManagement
if (is_array($oldInput)) {
foreach ($oldInput as $oldAction) {
try {
$triggers[] = view(
$triggers[] = prefixView(
'rules.partials.action',
[
'oldAction' => $oldAction['type'],
@@ -185,7 +185,7 @@ trait RuleManagement
if (is_array($oldInput)) {
foreach ($oldInput as $oldTrigger) {
try {
$renderedEntries[] = view(
$renderedEntries[] = prefixView(
'rules.partials.trigger',
[
'oldTrigger' => OperatorQuerySearch::getRootOperator($oldTrigger['type']),