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

(-)a/C4/Search.pm (+1 lines)
Lines 71-76 This module provides searching functions for Koha's bibliographic databases Link Here
71
  &AddSearchHistory
71
  &AddSearchHistory
72
  &GetDistinctValues
72
  &GetDistinctValues
73
  &BiblioAddAuthorities
73
  &BiblioAddAuthorities
74
  &enabled_staff_search_views
74
);
75
);
75
#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)
76
#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)
76
77
(-)a/serials/serials-edit.pl (-6 / +8 lines)
Lines 72-77 use C4::Koha; Link Here
72
use C4::Output;
72
use C4::Output;
73
use C4::Context;
73
use C4::Context;
74
use C4::Serials;
74
use C4::Serials;
75
use C4::Search qw/enabled_staff_search_views/;
75
use List::MoreUtils qw/uniq/;
76
use List::MoreUtils qw/uniq/;
76
77
77
my $query           = CGI->new();
78
my $query           = CGI->new();
Lines 403-416 output_html_with_http_headers $query, $cookie, $template->output; Link Here
403
404
404
sub get_default_view {
405
sub get_default_view {
405
    my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
406
    my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
406
    my $views = { C4::Search::enabled_staff_search_views };
407
    my %views       = C4::Search::enabled_staff_search_views();
407
    if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
408
    if ( $defaultview eq 'isbd' && $views{can_view_ISBD} ) {
408
        return 'ISBDdetail';
409
        return 'ISBDdetail';
409
    } elsif  ($defaultview eq 'marc' && $views->{can_view_MARC}) {
410
    }
411
    elsif ( $defaultview eq 'marc' && $views{can_view_MARC} ) {
410
        return 'MARCdetail';
412
        return 'MARCdetail';
411
    } elsif  ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {
413
    }
414
    elsif ( $defaultview eq 'labeled_marc' && $views{can_view_labeledMARC} ) {
412
        return 'labeledMARCdetail';
415
        return 'labeledMARCdetail';
413
    } else {
414
        return 'detail';
415
    }
416
    }
417
    return 'detail';
416
}
418
}
(-)a/serials/subscription-detail.pl (-7 / +8 lines)
Lines 24-29 use C4::Dates qw/format_date/; Link Here
24
use C4::Serials;
24
use C4::Serials;
25
use C4::Output;
25
use C4::Output;
26
use C4::Context;
26
use C4::Context;
27
use C4::Search qw/enabled_staff_search_views/;
27
use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
28
use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
28
use Carp;
29
use Carp;
29
30
Lines 143-156 output_html_with_http_headers $query, $cookie, $template->output; Link Here
143
144
144
sub get_default_view {
145
sub get_default_view {
145
    my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
146
    my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
146
    my $views = { C4::Search::enabled_staff_search_views };
147
    my %views       = C4::Search::enabled_staff_search_views();
147
    if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
148
    if ( $defaultview eq 'isbd' && $views{can_view_ISBD} ) {
148
        return 'ISBDdetail';
149
        return 'ISBDdetail';
149
    } elsif  ($defaultview eq 'marc' && $views->{can_view_MARC}) {
150
    }
151
    elsif ( $defaultview eq 'marc' && $views{can_view_MARC} ) {
150
        return 'MARCdetail';
152
        return 'MARCdetail';
151
    } elsif  ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {
153
    }
154
    elsif ( $defaultview eq 'labeled_marc' && $views{can_view_labeledMARC} ) {
152
        return 'labeledMARCdetail';
155
        return 'labeledMARCdetail';
153
    } else {
154
        return 'detail';
155
    }
156
    }
157
    return 'detail';
156
}
158
}
157
- 

Return to bug 7546