gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 35536: Remove last two references to resultset PluginData 

Test plan:
Run t/db_dependent/Koha/Plugins/Plugins.t

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Marcel de Rooy 2023-12-19 15:29:35 +00:00 committed by Katrin Fischer
parent 9b9ae27a0e
commit 34cc0d29df
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Koha/Plugins.pm
View File

@ -121,9 +121,8 @@ sub get_enabled_plugins {
my @plugin_classes;
try {
my $rs = Koha::Database->schema->resultset('PluginData');
$rs = $rs->search({ plugin_key => '__ENABLED__', plugin_value => 1 });
@plugin_classes = $rs->get_column('plugin_class')->all();
my $rs = Koha::Plugins::Datas->search({ plugin_key => '__ENABLED__', plugin_value => 1 });
@plugin_classes = $rs->get_column('plugin_class');
} catch {
warn "$_";
};

4
t/db_dependent/Koha/Plugins/Plugins.t
View File

@ -194,9 +194,7 @@ subtest 'Version upgrade tests' => sub {
my $plugin = Koha::Plugin::Test->new( { enable_plugins => 1, cgi => CGI->new } );
# make sure there's no version on the DB
$schema->resultset('PluginData')
->search( { plugin_class => $plugin->{class}, plugin_key => '__INSTALLED_VERSION__' } )
->delete;
Koha::Plugins::Datas->search( { plugin_class => $plugin->{class}, plugin_key => '__INSTALLED_VERSION__' } )->delete;
$plugin = Koha::Plugin::Test->new( { enable_plugins => 1, cgi => CGI->new } );
my $version = $plugin->retrieve_data('__INSTALLED_VERSION__');