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

(-)a/Koha/CirculationRules.pm (+4 lines)
Lines 50-55 sub get_effective_rule { Link Here
50
50
51
    croak q{No rule name passed in!} unless $rule_name;
51
    croak q{No rule name passed in!} unless $rule_name;
52
52
53
    for my $v ( $branchcode, $categorycode, $itemtype ) {
54
        $v = undef if $v and $v eq '*';
55
    }
56
53
    my $search_params;
57
    my $search_params;
54
    $search_params->{rule_name} = $rule_name;
58
    $search_params->{rule_name} = $rule_name;
55
59
(-)a/Koha/Template/Plugin/CirculationRules.pm (-3 / +2 lines)
Lines 30-43 sub Get { Link Here
30
    $categorycode = undef if $categorycode eq q{};
30
    $categorycode = undef if $categorycode eq q{};
31
    $itemtype     = undef if $itemtype eq q{};
31
    $itemtype     = undef if $itemtype eq q{};
32
32
33
    my $rule = Koha::CirculationRules->search(
33
    my $rule = Koha::CirculationRules->get_effective_rule(
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
    )->next();
40
    );
41
41
42
    return $rule->rule_value if $rule;
42
    return $rule->rule_value if $rule;
43
}
43
}
44
- 

Return to bug 18887