@@ -, +, @@
---
acqui/basket.pl | 6 ++----
admin/smart-rules.pl | 2 --
catalogue/detail.pl | 3 +--
circ/branchtransfers.pl | 2 +-
circ/circulation.pl | 7 -------
circ/returns.pl | 5 -----
koha-tmpl/intranet-tmpl/prog/en/includes/header.inc | 18 +++++-------------
tools/overduerules.pl | 1 -
8 files changed, 9 insertions(+), 35 deletions(-)
--- a/acqui/basket.pl
+++ a/acqui/basket.pl
@@ -199,8 +199,7 @@ if ( $op eq 'delete_confirm' ) {
# if requested, create basket group, close it and attach the basket
if ($query->param('createbasketgroup')) {
my $branchcode;
- if(C4::Context->userenv and C4::Context->userenv->{'branch'}
- and C4::Context->userenv->{'branch'} ne "NO_LIBRARY_SET") {
+ if(C4::Context->userenv and C4::Context->userenv->{'branch'}) {
$branchcode = C4::Context->userenv->{'branch'};
}
my $basketgroupid = NewBasketgroup( { name => $basket->{basketname},
@@ -543,8 +542,7 @@ sub edi_close_and_order {
if ( $query->param('createbasketgroup') ) {
my $branchcode;
if ( C4::Context->userenv
- and C4::Context->userenv->{'branch'}
- and C4::Context->userenv->{'branch'} ne "NO_LIBRARY_SET" )
+ and C4::Context->userenv->{'branch'} )
{
$branchcode = C4::Context->userenv->{'branch'};
}
--- a/admin/smart-rules.pl
+++ a/admin/smart-rules.pl
@@ -66,8 +66,6 @@ my $can_edit_from_any_library = $logged_in_patron->has_permission( {parameters =
$template->param( restricted_to_own_library => not $can_edit_from_any_library );
$branch = C4::Context::mybranch() unless $can_edit_from_any_library;
-$branch = '*' if $branch eq 'NO_LIBRARY_SET';
-
my $op = $input->param('op') || q{};
my $language = C4::Languages::getlanguage();
--- a/catalogue/detail.pl
+++ a/catalogue/detail.pl
@@ -382,8 +382,7 @@ foreach my $item (@items) {
}
}
- if ($currentbranch and $currentbranch ne "NO_LIBRARY_SET"
- and C4::Context->preference('SeparateHoldings')) {
+ if ($currentbranch and C4::Context->preference('SeparateHoldings')) {
if ($itembranchcode and $itembranchcode eq $currentbranch) {
push @itemloop, $item;
} else {
--- a/circ/branchtransfers.pl
+++ a/circ/branchtransfers.pl
@@ -45,7 +45,7 @@ if (!C4::Context->userenv){
my $sessionID = $query->cookie("CGISESSID");
my $session;
$session = get_session($sessionID) if $sessionID;
- if (!$session or $session->param('branch') eq 'NO_LIBRARY_SET'){
+ if (!$session){
# no branch set we can't transfer
print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl");
exit;
--- a/circ/circulation.pl
+++ a/circ/circulation.pl
@@ -73,13 +73,6 @@ my $override_high_holds_tmp = $query->param('override_high_holds_tmp');
my $sessionID = $query->cookie("CGISESSID") ;
my $session = get_session($sessionID);
-if (!C4::Context->userenv){
- if ($session->param('branch') eq 'NO_LIBRARY_SET'){
- # no branch set we can't issue
- print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl");
- exit;
- }
-}
my $barcodes = [];
my $barcode = $query->param('barcode');
--- a/circ/returns.pl
+++ a/circ/returns.pl
@@ -70,11 +70,6 @@ my ( $template, $librarian, $cookie, $flags ) = get_template_and_user(
my $sessionID = $query->cookie("CGISESSID");
my $session = get_session($sessionID);
-if ($session->param('branch') eq 'NO_LIBRARY_SET'){
- # no branch set we can't return
- print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl");
- exit;
-}
# Print a reserve slip on this page
if ( $query->param('print_slip') ) {
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -78,12 +78,8 @@
[% ELSE %]
- [% IF ( LoginBranchname == 'NO_LIBRARY_SET' ) %]
- NO LIBRARY SET
- [% ELSE %]
- [% LoginBranchname | html %]
- [% Branches.GetLoggedInBranchcode | html %]
- [% END %]
+ [% LoginBranchname | html %]
+ [% Branches.GetLoggedInBranchcode | html %]
[% END %]
@@ -101,13 +97,9 @@
[% LoginBranchname | html %]
[% ELSE %]
- [% IF ( LoginBranchname == 'NO_LIBRARY_SET' ) %]
- NO LIBRARY SET
- [% ELSE %]
- Location:
- [% LoginBranchname | html %]
- [% Branches.GetLoggedInBranchcode | html %]
- [% END %]
+ Location:
+ [% LoginBranchname | html %]
+ [% Branches.GetLoggedInBranchcode | html %]
[% END %]
--- a/tools/overduerules.pl
+++ a/tools/overduerules.pl
@@ -77,7 +77,6 @@ $branch =
: Koha::Libraries->search->count() == 1 ? undef
: undef;
$branch ||= q{};
-$branch = q{} if $branch eq 'NO_LIBRARY_SET';
my $op = $input->param('op');
$op ||= q{};
--