diff --git a/Koha/Plugins.pm b/Koha/Plugins.pm index c0aaa9cb37..be6bf3304d 100644 --- a/Koha/Plugins.pm +++ b/Koha/Plugins.pm @@ -79,6 +79,16 @@ sub GetPlugins { my $plugin = $plugin_class->new({ enable_plugins => $self->{'enable_plugins'} }); + my $plugin_enabled = $plugin->retrieve_data('__ENABLED__'); + $plugin->{enabled} = $plugin_enabled; + + # Want all plugins. Not only enabled ones. + if ( defined($params->{all}) && $params->{all} ) { + $plugin_enabled = 1; + } + + next unless $plugin_enabled; + # Limit results by method or metadata next if $method && !$plugin->can($method); my $plugin_metadata = $plugin->get_metadata; diff --git a/Koha/Plugins/Base.pm b/Koha/Plugins/Base.pm index 2cebe636d9..20d8b79829 100644 --- a/Koha/Plugins/Base.pm +++ b/Koha/Plugins/Base.pm @@ -50,7 +50,7 @@ sub new { ## Run the installation method if it exists and hasn't been run before if ( $self->can('install') && !$self->retrieve_data('__INSTALLED__') ) { if ( $self->install() ) { - $self->store_data( { '__INSTALLED__' => 1 } ); + $self->store_data( { '__INSTALLED__' => 1, '__ENABLED__' => 1 } ); if ( my $version = $plugin_version ) { $self->store_data({ '__INSTALLED_VERSION__' => $version }); } @@ -272,6 +272,36 @@ sub _version_compare { return 0; } +=head2 enable + +Method for enabling plugin + +$plugin->enable + +=cut + +sub enable { + my ($self) = @_; + + $self->store_data( {'__ENABLED__' => 1} ); + + return $self; +} + +=head2 disable + +Method for disabling plugin + +$plugin->disable + +=cut + +sub disable { + my ($self) = @_; + + $self->store_data( {'__ENABLED__' => 0} ); +} + 1; __END__ diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index 1dd3c6ca49..0ac6b70d48 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -524,7 +524,7 @@ input { } label, -.label { +.label:not(.label-primary):not(.label-default) { color: #000; display: inline; font-size: inherit; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt index 7d5d89c28a..2c2d556388 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt @@ -77,7 +77,14 @@ [% FOREACH plugin IN plugins %]