kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 16:57:09 +00:00
Code Issues Projects Releases Wiki Activity

Remove various sort routines.

Browse Source
This commit is contained in:
James Cole
2019-05-04 20:58:43 +02:00
parent d5c5fa4fad
commit 8676764513
19 changed files with 261 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Support/Twig/General.php
View File

@@ -59,7 +59,7 @@ class General extends Twig_Extension
$this->phpdate(),
$this->activeRouteStrict(),
$this->activeRoutePartial(),
$this->activeRoutePartialWhat(),
$this->activeRoutePartialObjectType(),
$this->formatDate(),
$this->getMetaField(),
$this->hasRole(),
@@ -77,7 +77,7 @@ class General extends Twig_Extension
return new Twig_SimpleFunction(
'activeRoutePartial',
function (): string {
$args = \func_get_args();
$args = func_get_args();
$route = $args[0]; // name of the route.
$name = Route::getCurrentRoute()->getName() ?? '';
if (!(false === strpos($name, $route))) {
@@ -95,15 +95,15 @@ class General extends Twig_Extension
*
* @return Twig_SimpleFunction
*/
protected function activeRoutePartialWhat(): Twig_SimpleFunction
protected function activeRoutePartialObjectType(): Twig_SimpleFunction
{
return new Twig_SimpleFunction(
'activeRoutePartialWhat',
function ($context): string {
[, $route, $what] = func_get_args();
$activeWhat = $context['what'] ?? false;
'activeRoutePartialObjectType',
static function ($context): string {
[, $route, $objectType] = func_get_args();
$activeObjectType = $context['objectType'] ?? false;
if ($what === $activeWhat && !(false === stripos(Route::getCurrentRoute()->getName(), $route))) {
if ($objectType === $activeObjectType && !(false === stripos(Route::getCurrentRoute()->getName(), $route))) {
return 'active';
}
@@ -347,5 +347,4 @@ class General extends Twig_Extension
}
);
}
}