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

(-)a/Koha/CirculationRules.pm (-3 / +4 lines)
Lines 240-253 sub get_effective_rules { Link Here
240
sub set_rule {
240
sub set_rule {
241
    my ( $self, $params ) = @_;
241
    my ( $self, $params ) = @_;
242
242
243
    for my $mandatory_parameter (qw( branchcode categorycode itemtype rule_name rule_value ) ) {
243
    for my $mandatory_parameter (qw( rule_name rule_value ) ) {
244
        Koha::Exceptions::MissingParameter->throw(
244
        Koha::Exceptions::MissingParameter->throw(
245
            "Required parameter 'branchcode' missing")
245
            "Required parameter '$mandatory_parameter' missing")
246
          unless exists $params->{$mandatory_parameter};
246
          unless exists $params->{$mandatory_parameter};
247
    }
247
    }
248
248
249
    my $kind_info = $RULE_KINDS->{ $params->{rule_name} };
249
    my $kind_info = $RULE_KINDS->{ $params->{rule_name} };
250
    croak "set_rule given unknown rule '$params->{rule_name}'!"
250
    Koha::Exceptions::MissingParameter->throw(
251
        "set_rule given unknown rule '$params->{rule_name}'!")
251
        unless defined $kind_info;
252
        unless defined $kind_info;
252
253
253
    # Enforce scope; a rule should be set for its defined scope, no more, no less.
254
    # Enforce scope; a rule should be set for its defined scope, no more, no less.
(-)a/Koha/Template/Plugin/CirculationRules.pm (-3 / +2 lines)
Lines 30-43 sub Get { Link Here
30
    $categorycode = undef if $categorycode eq q{} or $branchcode eq q{*};
30
    $categorycode = undef if $categorycode eq q{} or $branchcode eq q{*};
31
    $itemtype     = undef if $itemtype eq q{}     or $branchcode eq q{*};
31
    $itemtype     = undef if $itemtype eq q{}     or $branchcode eq q{*};
32
32
33
    my $rule = Koha::CirculationRules->get_effective_rule(
33
    my $rule = Koha::CirculationRules->search(
34
        {
34
        {
35
            branchcode   => $branchcode,
35
            branchcode   => $branchcode,
36
            categorycode => $categorycode,
36
            categorycode => $categorycode,
37
            itemtype     => $itemtype,
37
            itemtype     => $itemtype,
38
            rule_name    => $rule_name,
38
            rule_name    => $rule_name,
39
        }
39
        }
40
    );
40
    )->next;
41
41
42
    return $rule->rule_value if $rule;
42
    return $rule->rule_value if $rule;
43
}
43
}
44
- 

Return to bug 18936