@@ -, +, @@ --- C4/Search.pm | 1 + serials/serials-edit.pl | 14 ++++++++------ serials/subscription-detail.pl | 14 ++++++++------ 3 files changed, 17 insertions(+), 12 deletions(-) --- a/C4/Search.pm +++ a/C4/Search.pm @@ -71,6 +71,7 @@ This module provides searching functions for Koha's bibliographic databases &AddSearchHistory &GetDistinctValues &BiblioAddAuthorities + &enabled_staff_search_views ); #FIXME: i had to add BiblioAddAuthorities here because in Biblios.pm it caused circular dependencies (C4::Search uses C4::Biblio, and BiblioAddAuthorities uses SimpleSearch from C4::Search) --- a/serials/serials-edit.pl +++ a/serials/serials-edit.pl @@ -72,6 +72,7 @@ use C4::Koha; use C4::Output; use C4::Context; use C4::Serials; +use C4::Search qw/enabled_staff_search_views/; use List::MoreUtils qw/uniq/; my $query = CGI->new(); @@ -403,14 +404,15 @@ output_html_with_http_headers $query, $cookie, $template->output; sub get_default_view { my $defaultview = C4::Context->preference('IntranetBiblioDefaultView'); - my $views = { C4::Search::enabled_staff_search_views }; - if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) { + my %views = C4::Search::enabled_staff_search_views(); + if ( $defaultview eq 'isbd' && $views{can_view_ISBD} ) { return 'ISBDdetail'; - } elsif ($defaultview eq 'marc' && $views->{can_view_MARC}) { + } + elsif ( $defaultview eq 'marc' && $views{can_view_MARC} ) { return 'MARCdetail'; - } elsif ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) { + } + elsif ( $defaultview eq 'labeled_marc' && $views{can_view_labeledMARC} ) { return 'labeledMARCdetail'; - } else { - return 'detail'; } + return 'detail'; } --- a/serials/subscription-detail.pl +++ a/serials/subscription-detail.pl @@ -24,6 +24,7 @@ use C4::Dates qw/format_date/; use C4::Serials; use C4::Output; use C4::Context; +use C4::Search qw/enabled_staff_search_views/; use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/; use Carp; @@ -143,14 +144,15 @@ output_html_with_http_headers $query, $cookie, $template->output; sub get_default_view { my $defaultview = C4::Context->preference('IntranetBiblioDefaultView'); - my $views = { C4::Search::enabled_staff_search_views }; - if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) { + my %views = C4::Search::enabled_staff_search_views(); + if ( $defaultview eq 'isbd' && $views{can_view_ISBD} ) { return 'ISBDdetail'; - } elsif ($defaultview eq 'marc' && $views->{can_view_MARC}) { + } + elsif ( $defaultview eq 'marc' && $views{can_view_MARC} ) { return 'MARCdetail'; - } elsif ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) { + } + elsif ( $defaultview eq 'labeled_marc' && $views{can_view_labeledMARC} ) { return 'labeledMARCdetail'; - } else { - return 'detail'; } + return 'detail'; } --