Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@
}
],
"require": {
"php": "^7.4 || ^8.0",
"php": "^8.1",
"ext-curl": "*",
"ext-json": "*",
"composer/installers": "^1.0 || ^2.0",
"davaxi/sparkline": "^2.0",
"jaybizzle/crawler-detect": "^1.2",
"league/csv": "^9.0",
"symfony/stopwatch": "^4.0 || ^5.0 || ^6.0"
"symfony/stopwatch": "^4.0 || ^5.0 || ^6.0",
"winter/wn-backend-module": "~1.2.8"
},
"replace": {
"vdlp/oc-redirect-plugin": "<=3.1.1"
Expand Down
5 changes: 0 additions & 5 deletions controllers/Categories.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

use Backend\Behaviors;
use Backend\Classes\Controller;
use BackendMenu;

/**
* @mixin Behaviors\FormController
Expand All @@ -20,15 +19,11 @@ final class Categories extends Controller
];

public $requiredPermissions = ['winter.redirect.access_redirects'];
public string $formConfig = 'config_form.yaml';
public string $listConfig = 'config_list.yaml';

public function __construct()
{
parent::__construct();

$this->addCss('/plugins/winter/redirect/assets/css/redirect.css');

BackendMenu::setContext('Winter.Redirect', 'redirect', 'categories');
}
}
4 changes: 0 additions & 4 deletions controllers/Logs.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

use Backend\Behaviors\ListController;
use Backend\Classes\Controller;
use BackendMenu;
use Illuminate\Contracts\Translation\Translator;
use Illuminate\Http\Request;
use Winter\Storm\Flash\FlashBag;
Expand All @@ -26,7 +25,6 @@ final class Logs extends Controller
];

public $requiredPermissions = ['winter.redirect.access_redirects'];
public string $listConfig = 'config_list.yaml';
private Request $request;
private Translator $translator;
private FlashBag $flash;
Expand All @@ -36,8 +34,6 @@ public function __construct(Request $request, Translator $translator, LoggerInte
{
parent::__construct();

BackendMenu::setContext('Winter.Redirect', 'redirect', 'logs');

$this->addCss('/plugins/winter/redirect/assets/css/redirect.css');

$this->request = $request;
Expand Down
27 changes: 8 additions & 19 deletions controllers/Redirects.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,13 @@ final class Redirects extends Controller
Behaviors\RelationController::class,
];

public string $formConfig = 'config_form.yaml';
public $formLayout = 'sidebar';

public array $listConfig = [
'list' => 'config_list.yaml',
'requestLog' => 'request-log/config_list.yaml',
];

public string $reorderConfig = 'config_reorder.yaml';
public string $importExportConfig = 'config_import_export.yaml';
public string $relationConfig = 'config_relation.yaml';

public $requiredPermissions = ['winter.redirect.access_redirects'];

private Request $request;
Expand Down Expand Up @@ -106,14 +102,19 @@ public function index(): void
}
}

public function create()
{
$this->formLayout = 'standard';

parent::create();
}

/**
* @throws ModelNotFoundException
* @noinspection PhpStrictTypeCheckingInspection
*/
public function update($recordId = null, $context = null)
{
$this->bodyClass = 'compact-container';

/** @var Models\Redirect $redirect */
$redirect = Models\Redirect::query()->findOrFail($recordId);

Expand Down Expand Up @@ -170,18 +171,6 @@ public function getCacheManager(): CacheManagerInterface
return $this->cacheManager;
}

public function create_onSave(?string $context = null): RedirectResponse
{
/** @noinspection PhpPossiblePolymorphicInvocationInspection */
$redirect = parent::create_onSave($context);

if ($this->request->has('new')) {
return Backend::redirect('winter/redirect/redirects/create');
}

return $redirect;
}

public function index_onDelete(): array
{
$redirectIds = $this->getCheckedIds();
Expand Down
3 changes: 0 additions & 3 deletions controllers/Statistics.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

use Backend\Classes\Controller;
use Backend\Models\BrandSetting;
use BackendMenu;
use Carbon\Carbon;
use Carbon\Exceptions\InvalidFormatException;
use JsonException;
Expand All @@ -25,8 +24,6 @@ public function __construct()
{
parent::__construct();

BackendMenu::setContext('Winter.Redirect', 'redirect', 'statistics');

$this->pageTitle = 'winter.redirect::lang.title.statistics';

$this->addCss('/plugins/winter/redirect/assets/css/redirect.css');
Expand Down
48 changes: 0 additions & 48 deletions controllers/categories/create.htm

This file was deleted.

2 changes: 0 additions & 2 deletions controllers/categories/index.htm

This file was deleted.

56 changes: 0 additions & 56 deletions controllers/categories/update.htm

This file was deleted.

File renamed without changes.
2 changes: 0 additions & 2 deletions controllers/logs/index.htm

This file was deleted.

77 changes: 0 additions & 77 deletions controllers/redirects/_list_toolbar.htm

This file was deleted.

Loading
Loading