From 41ff156039319394b44f53d89a387ab64b1d5755 Mon Sep 17 00:00:00 2001 From: David Gustafsson Date: Thu, 11 Apr 2019 16:25:44 +0200 Subject: [PATCH] Bug 14957: Fix most Koha QA test tool errors --- Koha/MarcMergeRule.pm | 8 ++- Koha/MarcMergeRules.pm | 52 +++++++++++++--- Koha/MarcMergeRulesModule.pm | 6 +- Koha/MarcMergeRulesModules.pm | 14 +++++ .../prog/en/modules/admin/marc-merge-rules.tt | 72 ++++++++++++++-------- 5 files changed, 113 insertions(+), 39 deletions(-) diff --git a/Koha/MarcMergeRule.pm b/Koha/MarcMergeRule.pm index 7e42e292b5..989827f66a 100644 --- a/Koha/MarcMergeRule.pm +++ b/Koha/MarcMergeRule.pm @@ -23,7 +23,13 @@ my $cache = Koha::Caches->get_instance(); =head1 NAME -Koha::MarcMergeRule - Koha SearchField Object class +Koha::MarcMergeRule - Koha MarcMergeRule Object class + +=cut + +=head2 store + +Override C to clear marc merge rules cache. =cut diff --git a/Koha/MarcMergeRules.pm b/Koha/MarcMergeRules.pm index 100e26328b..255fba80d4 100644 --- a/Koha/MarcMergeRules.pm +++ b/Koha/MarcMergeRules.pm @@ -26,10 +26,6 @@ use Scalar::Util qw(looks_like_number); use parent qw(Koha::Objects); -sub operations { - return ('add', 'append', 'remove', 'delete'); -} - my $cache = Koha::Caches->get_instance(); =head1 NAME @@ -40,6 +36,16 @@ Koha::MarcMergeRules - Koha MarcMergeRules Object set class =head2 Class Methods +=head3 operations + +Returns a list of all valid operations. + +=cut + +sub operations { + return ('add', 'append', 'remove', 'delete'); +} + =head3 context_rules my $rules = Koha::MarcMergeRules->context_rules($context); @@ -287,32 +293,56 @@ sub _clear_caches { $cache->clear_from_cache('marc_merge_rules'); } +=head2 find_or_create + +Override C to clear marc merge rules cache. + +=cut + sub find_or_create { my $self = shift @_; $self->_clear_caches(); $self->SUPER::find_or_create(@_); } +=head2 update + +Override C to clear marc merge rules cache. + +=cut + sub update { my $self = shift @_; $self->_clear_caches(); return $self->SUPER::update(@_); } +=head2 delete + +Override C to clear marc merge rules cache. + +=cut + sub delete { my $self = shift @_; $self->_clear_caches(); return $self->SUPER::delete(@_); } +=head2 validate + + Koha::MarcMergeRules->validate($rule_data); + +Validates C<$rule_data>. Throws C +if C<$rule_data->{tag}> contains an invalid regular expression. Throws +C if contains invalid +combination of actions for control fields. Otherwise returns true. + +=cut + sub validate { my ($self, $rule_data) = @_; - #use Data::Dumper; - #Koha::Exceptions::MarcMergeRule::InvalidTagRegExp->throw( - # Dumper($rule_data) - #); - if(exists $rule_data->{tag}) { if ($rule_data->{tag} ne '*') { eval { qr/$rule_data->{tag}/ }; @@ -341,6 +371,10 @@ sub _type { return 'MarcMergeRule'; } +=head3 object_class + +=cut + sub object_class { return 'Koha::MarcMergeRule'; } diff --git a/Koha/MarcMergeRulesModule.pm b/Koha/MarcMergeRulesModule.pm index 9695759dc9..f53d4da141 100644 --- a/Koha/MarcMergeRulesModule.pm +++ b/Koha/MarcMergeRulesModule.pm @@ -21,7 +21,7 @@ use parent qw(Koha::Object); =head1 NAME -Koha::MarcMergeRulesModule - Koha SearchField Object class +Koha::MarcMergeRulesModule - Koha MarcMergeRulesModule Object class =head1 API @@ -29,10 +29,6 @@ Koha::MarcMergeRulesModule - Koha SearchField Object class =cut -=head3 type - -=cut - sub _type { return 'MarcMergeRulesModule'; } diff --git a/Koha/MarcMergeRulesModules.pm b/Koha/MarcMergeRulesModules.pm index 6c1b163699..543e6c018c 100644 --- a/Koha/MarcMergeRulesModules.pm +++ b/Koha/MarcMergeRulesModules.pm @@ -20,10 +20,24 @@ use Koha::MarcMergeRulesModule; use parent qw(Koha::Objects); +=head1 NAME + +Koha::MarcRulesModules - Koha MarcRulesModules Object set class + +=head1 API + +=head2 Class Methods + +=cut + sub _type { return 'MarcMergeRulesModule'; } +=head3 object_class + +=cut + sub object_class { return 'Koha::MarcMergeRulesModule'; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt index 8983c29f2e..c4c2c030f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt @@ -2,7 +2,7 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › MARC merge rules [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] [% INCLUDE 'datatables.inc' %]