kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-18 15:39:50 +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-01-31 20:35:54 +01:00
parent fd8a59924d
commit ffe18c63a5
88 changed files with 176 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Rule/CreateController.php
View File

@@ -126,7 +126,7 @@ class CreateController extends Controller
}
session()->forget('rules.create.fromStore');
return view(
return prefixView(
'rules.rule.create',
compact('subTitleIcon', 'oldTriggers', 'preFilled', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', 'subTitle')
);
@@ -180,7 +180,7 @@ class CreateController extends Controller
}
session()->forget('rules.create.fromStore');
return view(
return prefixView(
'rules.rule.create',
compact('subTitleIcon', 'oldTriggers', 'preFilled', 'oldActions', 'triggerCount', 'actionCount', 'subTitle')
);
@@ -229,7 +229,7 @@ class CreateController extends Controller
}
session()->forget('rules.create.fromStore');
return view(
return prefixView(
'rules.rule.create',
compact('subTitleIcon', 'oldTriggers', 'preFilled', 'oldActions', 'triggerCount', 'actionCount', 'subTitle')
);

2
app/Http/Controllers/Rule/DeleteController.php
View File

@@ -74,7 +74,7 @@ class DeleteController extends Controller
// put previous url in session
$this->rememberPreviousUri('rules.delete.uri');
return view('rules.rule.delete', compact('rule', 'subTitle'));
return prefixView('rules.rule.delete', compact('rule', 'subTitle'));
}
/**

4
app/Http/Controllers/Rule/EditController.php
View File

@@ -136,7 +136,7 @@ class EditController extends Controller
$request->session()->flash('preFilled', $preFilled);
return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount'));
return prefixView('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount'));
}
/**
@@ -187,7 +187,7 @@ class EditController extends Controller
$index = 0;
foreach ($submittedOperators as $operator) {
try {
$renderedEntries[] = view(
$renderedEntries[] = prefixView(
'rules.partials.trigger',
[
'oldTrigger' => OperatorQuerySearch::getRootOperator($operator['type']),

2
app/Http/Controllers/Rule/IndexController.php
View File

@@ -79,7 +79,7 @@ class IndexController extends Controller
$this->ruleGroupRepos->resetRuleGroupOrder();
$ruleGroups = $this->ruleGroupRepos->getRuleGroupsWithRules($user);
return view('rules.index', compact('ruleGroups'));
return prefixView('rules.index', compact('ruleGroups'));
}
/**

6
app/Http/Controllers/Rule/SelectController.php
View File

@@ -123,7 +123,7 @@ class SelectController extends Controller
$today = Carbon::now()->format('Y-m-d');
$subTitle = (string) trans('firefly.apply_rule_selection', ['title' => $rule->title]);
return view('rules.rule.select-transactions', compact('first', 'today', 'rule', 'subTitle'));
return prefixView('rules.rule.select-transactions', compact('first', 'today', 'rule', 'subTitle'));
}
/**
@@ -176,7 +176,7 @@ class SelectController extends Controller
// Return json response
$view = 'ERROR, see logs.';
try {
$view = view('list.journals-array-tiny', ['groups' => $collection])->render();
$view = prefixView('list.journals-array-tiny', ['groups' => $collection])->render();
// @codeCoverageIgnoreStart
} catch (Throwable $exception) {
Log::error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage()));
@@ -223,7 +223,7 @@ class SelectController extends Controller
// Return json response
$view = 'ERROR, see logs.';
try {
$view = view('list.journals-array-tiny', ['groups' => $collection])->render();
$view = prefixView('list.journals-array-tiny', ['groups' => $collection])->render();
// @codeCoverageIgnoreStart
} catch (Throwable $exception) {
Log::error(sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage()));