View | Details | Raw Unified | Return to bug 18887
Collapse All | Expand All

(-)a/Koha/CirculationRules.pm (-14 / +9 lines)
Lines 20-27 package Koha::CirculationRules; Link Here
20
20
21
use Modern::Perl;
21
use Modern::Perl;
22
22
23
use Carp qw(croak);
23
use Koha::Exceptions;
24
25
use Koha::CirculationRule;
24
use Koha::CirculationRule;
26
25
27
use base qw(Koha::Objects);
26
use base qw(Koha::Objects);
Lines 48-54 sub get_effective_rule { Link Here
48
    my $itemtype     = $params->{itemtype};
47
    my $itemtype     = $params->{itemtype};
49
    my $branchcode   = $params->{branchcode};
48
    my $branchcode   = $params->{branchcode};
50
49
51
    croak q{No rule name passed in!} unless $rule_name;
50
    Koha::Exceptions::MissingParameter->throw(
51
        "Required parameter 'rule_name' missing")
52
      unless $rule_name;
52
53
53
    for my $v ( $branchcode, $categorycode, $itemtype ) {
54
    for my $v ( $branchcode, $categorycode, $itemtype ) {
54
        $v = undef if $v and $v eq '*';
55
        $v = undef if $v and $v eq '*';
Lines 81-96 sub get_effective_rule { Link Here
81
sub set_rule {
82
sub set_rule {
82
    my ( $self, $params ) = @_;
83
    my ( $self, $params ) = @_;
83
84
84
    croak q{set_rule requires the parameter 'branchcode'!}
85
    for my $mandatory_parameter (qw( branchcode categorycode itemtype rule_name rule_value ) ){
85
      unless exists $params->{branchcode};
86
        Koha::Exceptions::MissingParameter->throw(
86
    croak q{set_rule requires the parameter 'categorycode'!}
87
            "Required parameter 'branchcode' missing")
87
      unless exists $params->{categorycode};
88
          unless exists $params->{$mandatory_parameter};
88
    croak q{set_rule requires the parameter 'itemtype'!}
89
    }
89
      unless exists $params->{itemtype};
90
    croak q{set_rule requires the parameter 'rule_name'!}
91
      unless exists $params->{rule_name};
92
    croak q{set_rule requires the parameter 'rule_value'!}
93
      unless exists $params->{rule_value};
94
90
95
    my $branchcode   = $params->{branchcode};
91
    my $branchcode   = $params->{branchcode};
96
    my $categorycode = $params->{categorycode};
92
    my $categorycode = $params->{categorycode};
97
- 

Return to bug 18887