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

(-)a/admin/smart-rules.pl (-7 / +9 lines)
Lines 30-35 use Koha::DateUtils; Link Here
30
use Koha::Database;
30
use Koha::Database;
31
use Koha::IssuingRule;
31
use Koha::IssuingRule;
32
use Koha::IssuingRules;
32
use Koha::IssuingRules;
33
use Koha::Libraries;
33
34
34
my $input = CGI->new;
35
my $input = CGI->new;
35
my $dbh = C4::Context->dbh;
36
my $dbh = C4::Context->dbh;
Lines 47-58 my ($template, $loggedinuser, $cookie) Link Here
47
48
48
my $type=$input->param('type');
49
my $type=$input->param('type');
49
50
50
my $branch;
51
my $branch = $input->param('branch');
51
if ( C4::Context->preference('DefaultToLoggedInLibraryCircRules') ) {
52
unless ( $branch ) {
52
    $branch = $input->param('branch') || GetBranchesCount() == 1 ? undef : C4::Branch::mybranch();
53
    if ( C4::Context->preference('DefaultToLoggedInLibraryCircRules') ) {
53
}
54
        $branch = Koha::Libraries->search->count() == 1 ? undef : C4::Branch::mybranch();
54
else {
55
    }
55
    $branch = $input->param('branch') || ( C4::Branch::onlymine() ? ( C4::Branch::mybranch() || '*' ) : '*' );
56
    else {
57
        $branch = C4::Branch::onlymine() ? ( C4::Branch::mybranch() || '*' ) : '*';
58
    }
56
}
59
}
57
$branch = '*' if $branch eq 'NO_LIBRARY_SET';
60
$branch = '*' if $branch eq 'NO_LIBRARY_SET';
58
61
59
- 

Return to bug 15568