Added ability to filter enabled or disabled with bin/gpm index #3187
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mahagr
requested changes
Feb 1, 2021
| $installed = $this->isPluginInstalled($slug); | ||
|
|
||
| $enabled = isset($config[$slug]) && ((bool)$config[$slug]['enabled'] == true); | ||
| $disabled = isset($config[$slug]['enabled']) && ((bool)$config[$slug]['enabled'] === false); |
There was a problem hiding this comment.
Umm, aren't these two lines the same?
Here's better code:
return (bool)($config[$slug]['enabled'] ?? false);
| public function isPluginEnabled($slug) | ||
| { | ||
| $result = null; | ||
| $grav = new Grav(); |
There was a problem hiding this comment.
This won't work. Use $grav = Grav::instance();
| */ | ||
| public function isThemeEnabled($slug) | ||
| { | ||
| $grav = new Grav(); |
There was a problem hiding this comment.
Same as above...I'll fix this.
| $current_theme = $grav::instance()['config']['system']['pages']['theme']; | ||
| $theme_installed = $this->isThemeInstalled($slug); | ||
|
|
||
| if ($current_theme == $slug) { |
There was a problem hiding this comment.
I'd do the same as with plugins. I would also move check for installed outside of this (and plugin) method and check it elsewhere..
| @@ -138,7 +150,8 @@ protected function serve(): int | |||
| 'Name' => '<cyan>' . Utils::truncate($package->name, 20, false, ' ', '...') . '</cyan> ', | |||
| 'Slug' => $slug, | |||
| 'Version'=> $this->version($package), | |||
| 'Installed' => $this->installed($package) | |||
| 'Installed' => $this->installed($package), | |||
| 'Enabled' => $this->enabled($package), | |||
There was a problem hiding this comment.
and have something like: 'Enabled' => $this->installed($package) ? $this->enabled($package) : null, here.
There was a problem hiding this comment.
@jgonyea If you check here, this change would check all your 3 cases: true, false and null.
mahagr
added a commit
that referenced
this pull request
Feb 8, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Third time's the charm (hopefully)
Adds ability to filter index results based on enabled/ disabled settings.