Skip to content

Prevent useless DB queries on plugins state checks #2886

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

Merged
btry merged 2 commits into from
Jul 27, 2022
Merged

Prevent useless DB queries on plugins state checks #2886

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
c382af2
Prevent useless DB queries on plugins state checks
cedric-anne Jul 25, 2022
b1161ba
Merge branch 'develop' into task/save-db-queries
btry Jul 27, 2022
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
6 changes: 2 additions & 4 deletions inc/abstractitiltarget.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1044,8 +1044,7 @@ protected function showUrgencySettings($rand) {
protected function showPluginTagsSettings($rand) {
global $DB;

$plugin = new Plugin();
if ($plugin->isInstalled('tag') && $plugin->isActivated('tag')) {
if (Plugin::isPluginActive('tag')) {
echo '<tr>';
echo '<td width="15%">' . __('Ticket tags', 'formcreator') . '</td>';
echo '<td width="25%">';
Expand Down Expand Up @@ -1695,8 +1694,7 @@ protected function saveTags(PluginFormcreatorFormanswer $formanswer, $targetId)
global $DB;

// Add tag if presents
$plugin = new Plugin();
if (!$plugin->isActivated('tag')) {
if (!Plugin::isPluginActive('tag')) {
return;
}

Expand Down
6 changes: 3 additions & 3 deletions inc/field/fieldsfield.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function getField(): ?PluginFieldsField {
}

public function isPrerequisites(): bool {
return (new Plugin())->isActivated('fields');
return Plugin::isPluginActive('fields');
}

public static function getFieldsFromBlock($block_id): array {
Expand Down Expand Up @@ -149,7 +149,7 @@ public function getBlocks(): array {
}

public function showForm(array $options): void {
if (!\Plugin::isPluginActive('fields')) {
if (!Plugin::isPluginActive('fields')) {
$options['error'] = __('Warning: Additional Fields plugin is disabled or missing', 'formcreator');
$template = '@formcreator/field/undefinedfield.html.twig';
TemplateRenderer::getInstance()->display($template, [
Expand Down Expand Up @@ -177,7 +177,7 @@ public function showForm(array $options): void {

public function getRenderedHtml($domain, $canEdit = true): string {
// Plugin field not available
if (!(new Plugin())->isActivated('fields')) {
if (!Plugin::isPluginActive('fields')) {
return '';
}

Expand Down
3 changes: 2 additions & 1 deletion inc/field/tagfield.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
namespace GlpiPlugin\Formcreator\Field;

use Dropdown;
use Plugin;
use PluginTagTag;
use Session;
use GlpiPlugin\Formcreator\Exception\ComparisonException;
Expand All @@ -46,7 +47,7 @@ public function isPrerequisites(): bool {
}

public function showForm(array $options): void {
if (!\Plugin::isPluginActive('tag')) {
if (!Plugin::isPluginActive('tag')) {
$options['error'] = __('Warning: Tag plugin is disabled or missing', 'formcreator');
$template = '@formcreator/field/undefinedfield.html.twig';
TemplateRenderer::getInstance()->display($template, [
Expand Down
4 changes: 2 additions & 2 deletions inc/question.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,10 +1323,10 @@ public static function dropdownObjectSubType(string $name, array $options = []):
Profile::class => Profile::getTypeName(2)
],
];
if ((new Plugin())->isActivated('appliances')) {
if (Plugin::isPluginActive('appliances')) {
$optgroup[__("Assets")][PluginAppliancesAppliance::class] = PluginAppliancesAppliance::getTypeName(2) . ' (' . _n('Plugin', 'Plugins', 1) . ')';
}
if ((new Plugin())->isActivated('databases')) {
if (Plugin::isPluginActive('databases')) {
$optgroup[__("Assets")][PluginDatabasesDatabase::class] = PluginDatabasesDatabase::getTypeName(2) . ' (' . _n('Plugin', 'Plugins', 1) . ')';
}

Expand Down
5 changes: 2 additions & 3 deletions inc/targetchange.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) {
2 => __('Actors', 'formcreator'),
3 => __('Condition', 'formcreator'),
];
// if ((new Plugin)->isActivated('fields')) {
// if (Plugin::isPluginActive('fields')) {
// $tab[4] = __('Fields plugin', 'formcreator');
// }
return $tab;
Expand Down Expand Up @@ -584,8 +584,7 @@ public function prepareInputForUpdate($input) {
}
}

$plugin = new Plugin();
if ($plugin->isInstalled('tag') && $plugin->isActivated('tag')) {
if (Plugin::isPluginActive('tag')) {
if (isset($input['tag_questions'])) {
$input['tag_questions'] = (!empty($input['_tag_questions']))
? implode(',', $input['_tag_questions'])
Expand Down
5 changes: 2 additions & 3 deletions inc/targetproblem.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,7 @@ public function prepareInputForUpdate($input) {
}
}

$plugin = new Plugin();
if ($plugin->isInstalled('tag') && $plugin->isActivated('tag')) {
if (Plugin::isPluginActive('tag')) {
$input['tag_questions'] = (!empty($input['_tag_questions']))
? implode(',', $input['_tag_questions'])
: '';
Expand Down Expand Up @@ -581,7 +580,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) {
2 => __('Actors', 'formcreator'),
3 => __('Condition', 'formcreator'),
];
// if ((new Plugin)->isActivated('fields')) {
// if (Plugin::isPluginActive('fields')) {
// $tab[4] = __('Fields plugin', 'formcreator');
// }
return $tab;
Expand Down
4 changes: 2 additions & 2 deletions inc/targetticket.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) {
2 => __('Actors', 'formcreator'),
3 => __('Condition', 'formcreator'),
];
// if ((new Plugin)->isActivated('fields')) {
// if (Plugin::isPluginActive('fields')) {
// $tab[4] = __('Fields plugin', 'formcreator');
// }
return $tab;
Expand Down Expand Up @@ -689,7 +689,7 @@ public function prepareInputForUpdate($input) {
}

$plugin = new Plugin();
if ($plugin->isActivated('tag')) {
if (Plugin::isPluginActive('tag')) {
if (isset($input['tag_questions'])) {
$input['tag_questions'] = (!empty($input['_tag_questions']))
? implode(',', $input['_tag_questions'])
Expand Down