Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove usage of ajaxDie #62

Merged
merged 2 commits into from
Feb 20, 2024
Merged

Remove usage of ajaxDie #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d163527
Remove ajaxDie
Hlavtox Feb 7, 2024
fa5e617
Update AdminPsThemeCustoConfiguration.php
Hlavtox Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion controllers/admin/AdminPsThemeCustoConfiguration.php
View file
Open in desktop
Expand Up @@ -482,7 +482,13 @@ public function ajaxProcessUpdateModule()
'moduleActionsNames' => $this->moduleActionsNames,
]);

$this->ajaxDie($this->context->smarty->fetch(__DIR__ . '/../../views/templates/admin/controllers/' . $this->controller_quick_name . '/elem/module_actions.tpl'));
$tplPath = $this->context->smarty->fetch(__DIR__ . '/../../views/templates/admin/controllers/' . $this->controller_quick_name . '/elem/module_actions.tpl');
if (version_compare(_PS_VERSION_, '1.7.5', '>=')) {
$this->ajaxRender($tplPath);
exit;
} else {
$this->ajaxDie($tplPath);
}
}

/**
Expand Down
1 change: 1 addition & 0 deletions tests/phpstan/phpstan-1.7.1.2.neon
View file
Open in desktop
Expand Up @@ -5,3 +5,4 @@ parameters:
ignoreErrors:
- '#Access to an undefined property Cookie::\$profile.#'
- '#Call to static method getInstance\(\) on an unknown class PrestaShop\\PrestaShop\\Adapter\\SymfonyContainer.#'
- '#Call to an undefined method AdminPsThemeCustoConfigurationController::ajaxRender\(\).#'
1 change: 1 addition & 0 deletions tests/phpstan/phpstan-1.7.2.5.neon
View file
Open in desktop
Expand Up @@ -5,3 +5,4 @@ parameters:
ignoreErrors:
- '#Access to an undefined property Cookie::\$profile.#'
- '#Call to static method getInstance\(\) on an unknown class PrestaShop\\PrestaShop\\Adapter\\SymfonyContainer.#'
- '#Call to an undefined method AdminPsThemeCustoConfigurationController::ajaxRender\(\).#'
1 change: 1 addition & 0 deletions tests/phpstan/phpstan-1.7.3.4.neon
View file
Open in desktop
Expand Up @@ -4,3 +4,4 @@ includes:
parameters:
ignoreErrors:
- '#Access to an undefined property Cookie::\$profile.#'
- '#Call to an undefined method AdminPsThemeCustoConfigurationController::ajaxRender\(\).#'
1 change: 1 addition & 0 deletions tests/phpstan/phpstan-1.7.4.4.neon
View file
Open in desktop
Expand Up @@ -4,3 +4,4 @@ includes:
parameters:
ignoreErrors:
- '#Access to an undefined property Cookie::\$profile.#'
- '#Call to an undefined method AdminPsThemeCustoConfigurationController::ajaxRender\(\).#'
1 change: 1 addition & 0 deletions tests/phpstan/phpstan-1.7.5.1.neon
View file
Open in desktop
Expand Up @@ -4,3 +4,4 @@ includes:
parameters:
ignoreErrors:
- '#Access to an undefined property Cookie::\$profile.#'
- '#Parameter \#1 \$value of method ControllerCore::ajaxRender\(\) expects null, string given.#'
1 change: 1 addition & 0 deletions tests/phpstan/phpstan-1.7.6.neon
View file
Open in desktop
Expand Up @@ -4,3 +4,4 @@ includes:
parameters:
ignoreErrors:
- '#Access to an undefined property Cookie::\$profile.#'
- '#Parameter \#1 \$value of method ControllerCore::ajaxRender\(\) expects null, string given.#'
1 change: 1 addition & 0 deletions tests/phpstan/phpstan-1.7.7.neon
View file
Open in desktop
Expand Up @@ -4,3 +4,4 @@ includes:
parameters:
ignoreErrors:
- '#Access to an undefined property Cookie::\$profile.#'
- '#Parameter \#1 \$value of method ControllerCore::ajaxRender\(\) expects null, string given.#'