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

(-)a/C4/Auth.pm (-2 lines)
Lines 498-504 sub get_template_and_user { Link Here
498
    my $minPasswordLength = C4::Context->preference('minPasswordLength');
498
    my $minPasswordLength = C4::Context->preference('minPasswordLength');
499
    $minPasswordLength = 3 if not $minPasswordLength or $minPasswordLength < 3;
499
    $minPasswordLength = 3 if not $minPasswordLength or $minPasswordLength < 3;
500
    $template->param(
500
    $template->param(
501
        "BiblioDefaultView" . C4::Context->preference("BiblioDefaultView") => 1,
502
        EnhancedMessagingPreferences                                       => C4::Context->preference('EnhancedMessagingPreferences'),
501
        EnhancedMessagingPreferences                                       => C4::Context->preference('EnhancedMessagingPreferences'),
503
        GoogleJackets                                                      => C4::Context->preference("GoogleJackets"),
502
        GoogleJackets                                                      => C4::Context->preference("GoogleJackets"),
504
        OpenLibraryCovers                                                  => C4::Context->preference("OpenLibraryCovers"),
503
        OpenLibraryCovers                                                  => C4::Context->preference("OpenLibraryCovers"),
Lines 520-526 sub get_template_and_user { Link Here
520
        $template->param(
519
        $template->param(
521
            AmazonCoverImages                                                          => C4::Context->preference("AmazonCoverImages"),
520
            AmazonCoverImages                                                          => C4::Context->preference("AmazonCoverImages"),
522
            AutoLocation                                                               => C4::Context->preference("AutoLocation"),
521
            AutoLocation                                                               => C4::Context->preference("AutoLocation"),
523
            "BiblioDefaultView" . C4::Context->preference("IntranetBiblioDefaultView") => 1,
524
            PatronAutoComplete                                                       => C4::Context->preference("PatronAutoComplete"),
522
            PatronAutoComplete                                                       => C4::Context->preference("PatronAutoComplete"),
525
            FRBRizeEditions                                                            => C4::Context->preference("FRBRizeEditions"),
523
            FRBRizeEditions                                                            => C4::Context->preference("FRBRizeEditions"),
526
            IndependentBranches                                                        => C4::Context->preference("IndependentBranches"),
524
            IndependentBranches                                                        => C4::Context->preference("IndependentBranches"),
(-)a/basket/basket.pl (-9 lines)
Lines 108-122 foreach my $biblionumber ( @bibs ) { Link Here
108
    $dat->{MARCURLS}    = $marcurlsarray;
108
    $dat->{MARCURLS}    = $marcurlsarray;
109
    $dat->{HASAUTHORS}  = $hasauthors;
109
    $dat->{HASAUTHORS}  = $hasauthors;
110
110
111
    if ( C4::Context->preference("IntranetBiblioDefaultView") eq "normal" ) {
112
        $dat->{dest} = "/cgi-bin/koha/catalogue/detail.pl";
113
    }
114
    elsif ( C4::Context->preference("IntranetBiblioDefaultView") eq "marc" ) {
115
        $dat->{dest} = "/cgi-bin/koha/catalogue/MARCdetail.pl";
116
    }
117
    else {
118
        $dat->{dest} = "/cgi-bin/koha/catalogue/ISBDdetail.pl";
119
    }
120
    push( @results, $dat );
111
    push( @results, $dat );
121
}
112
}
122
113
(-)a/cataloguing/value_builder/marc21_linking_section.pl (-2 lines)
Lines 255-261 my $launcher = sub { Link Here
255
        } else {
255
        } else {
256
            $to = $from + $resultsperpage;
256
            $to = $from + $resultsperpage;
257
        }
257
        }
258
        my $defaultview = 'BiblioDefaultView' . C4::Context->preference('BiblioDefaultView');
259
258
260
        #         my $link="/cgi-bin/koha/cataloguing/value_builder/unimarc4XX.pl?op=do_search&q=$search_desc&resultsperpage=$resultsperpage&startfrom=$startfrom&search=$search";
259
        #         my $link="/cgi-bin/koha/cataloguing/value_builder/unimarc4XX.pl?op=do_search&q=$search_desc&resultsperpage=$resultsperpage&startfrom=$startfrom&search=$search";
261
        #           foreach my $sort (@sort_by){
260
        #           foreach my $sort (@sort_by){
Lines 285-291 my $launcher = sub { Link Here
285
            to             => $to,
284
            to             => $to,
286
            numbers        => \@numbers,
285
            numbers        => \@numbers,
287
            search         => $search,
286
            search         => $search,
288
            $defaultview   => 1,
289
            Search         => 0
287
            Search         => 0
290
        );
288
        );
291
289
(-)a/cataloguing/value_builder/unimarc_field_4XX.pl (-3 lines)
Lines 439-446 sub plugin { Link Here
439
        }else{
439
        }else{
440
            $to = $from + $resultsperpage ;
440
            $to = $from + $resultsperpage ;
441
        }
441
        }
442
        my $defaultview =
443
          'BiblioDefaultView' . C4::Context->preference('BiblioDefaultView');
444
#         my $link="/cgi-bin/koha/cataloguing/value_builder/unimarc4XX.pl?op=do_search&q=$search_desc&resultsperpage=$resultsperpage&startfrom=$startfrom&search=$search";
442
#         my $link="/cgi-bin/koha/cataloguing/value_builder/unimarc4XX.pl?op=do_search&q=$search_desc&resultsperpage=$resultsperpage&startfrom=$startfrom&search=$search";
445
#           foreach my $sort (@sort_by){
443
#           foreach my $sort (@sort_by){
446
#             $link.="&sort_by=".$sort."&";
444
#             $link.="&sort_by=".$sort."&";
Lines 469-475 sub plugin { Link Here
469
            to             => $to,
467
            to             => $to,
470
            numbers        => \@numbers,
468
            numbers        => \@numbers,
471
            search         => $search,
469
            search         => $search,
472
            $defaultview   => 1,
473
            Search         => 0
470
            Search         => 0
474
        );
471
        );
475
472
(-)a/circ/pendingreserves.pl (-1 lines)
Lines 300-306 $template->param( Link Here
300
    from                => $startdate,
300
    from                => $startdate,
301
    to                  => $enddate,
301
    to                  => $enddate,
302
    holds_info          => \@holds_info,
302
    holds_info          => \@holds_info,
303
    "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
304
    HoldsToPullStartDate => C4::Context->preference('HoldsToPullStartDate') || PULL_INTERVAL,
303
    HoldsToPullStartDate => C4::Context->preference('HoldsToPullStartDate') || PULL_INTERVAL,
305
    HoldsToPullEndDate  => C4::Context->preference('ConfirmFutureHolds') || 0,
304
    HoldsToPullEndDate  => C4::Context->preference('ConfirmFutureHolds') || 0,
306
    messages            => \@messages,
305
    messages            => \@messages,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc (-10 / +2 lines)
Lines 1-13 Link Here
1
[% IF ( link ) %]
1
[% IF ( link ) %]
2
    [% IF ( BiblioDefaultViewmarc ) %]
2
    <a href="[% PROCESS biblio_a_href biblionumber => biblio.biblionumber %]" class="title">
3
        <a class="title" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblio.biblionumber |url %]">
4
    [% ELSIF ( BiblioDefaultViewlabeled_marc ) %]
5
        <a class="title" href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=[% biblio.biblionumber |url %]">
6
    [% ELSIF ( BiblioDefaultViewisbd ) %]
7
        <a class="title" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=[% biblio.biblionumber |url %]">
8
    [% ELSE %]
9
        <a class="title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber |url %]">
10
    [% END %]
11
[% END %]
3
[% END %]
12
4
13
[% IF ( biblio.title ) %]
5
[% IF ( biblio.title ) %]
Lines 36-39 Link Here
36
28
37
[% IF ( link ) %]
29
[% IF ( link ) %]
38
    </a>
30
    </a>
39
[% END %]
31
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc (+13 lines)
Lines 69-74 Link Here
69
    [% END %]
69
    [% END %]
70
[% END %]
70
[% END %]
71
71
72
[% BLOCK biblio_a_href -%]
73
    [%- IF Koha.Preference('IntranetBiblioDefaultView') == 'marc' && Koha.Preference('viewMARC') -%]
74
        [%- SET this_biblio_href = "/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=" -%]
75
    [%- ELSIF Koha.Preference('IntranetBiblioDefaultView') == 'labeled_marc' && Koha.Preference('viewLabeledMARC') -%]
76
        [%- SET this_biblio_href = "/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=" -%]
77
    [%- ELSIF Koha.Preference('IntranetBiblioDefaultView') == 'isbd' && Koha.Preference('viewISBD') -%]
78
        [%- SET this_biblio_href = "/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=" -%]
79
    [%- ELSE -%]
80
        [%- SET this_biblio_href = "/cgi-bin/koha/catalogue/detail.pl?biblionumber=" -%]
81
    [%- END -%]
82
    [%- this_biblio_href | url %][% biblionumber | url -%]
83
[%- END %]
84
72
[% BLOCK subfields_for_item %]
85
[% BLOCK subfields_for_item %]
73
    <ol>
86
    <ol>
74
        [% FOREACH subfield IN subfields %]
87
        [% FOREACH subfield IN subfields %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt (-4 / +1 lines)
Lines 34-43 Link Here
34
34
35
<div class="dialog alert">
35
<div class="dialog alert">
36
<h4>Duplicate warning</h4>
36
<h4>Duplicate warning</h4>
37
<p>You selected a record from an external source that matches an existing record in your catalog: [% IF ( BiblioDefaultViewmarc ) %]<a target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblionumber |url %]">
37
<p>You selected a record from an external source that matches an existing record in your catalog: <a target="_blank" title="Open in new window" href="[% PROCESS biblio_a_href biblionumber => biblionumber %]"><i class="fa fa-window-restore"></i> [% duplicatetitle | html %]</a></p>
38
[% ELSIF ( BiblioDefaultViewlabeled_marc ) %]<a target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=[% biblionumber |url %]">
39
[% ELSIF ( BiblioDefaultViewisbd ) %]<a target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=[% biblionumber |url %]">
40
[% ELSE %]<a target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber |url %]">[% END %] <i class="fa fa-window-restore"></i> [% duplicatetitle | html %]</a></p>
41
</div>
38
</div>
42
39
43
<div class="row">
40
<div class="row">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-12 / +3 lines)
Lines 7-21 Link Here
7
[% PROCESS 'i18n.inc' %]
7
[% PROCESS 'i18n.inc' %]
8
[% SET footerjs = 1 %]
8
[% SET footerjs = 1 %]
9
[% USE AuthorisedValues %]
9
[% USE AuthorisedValues %]
10
[% IF BiblioDefaultViewmarc %]
11
    [% SET DetailPage="MARCdetail.pl" %]
12
[% ELSIF BiblioDefaultViewlabeled_marc %]
13
    [% SET DetailPage="labeledMARCdetail.pl" %]
14
[% ELSIF BiblioDefaultViewisbd %]
15
    [% SET DetailPage="ISBDdetail.pl" %]
16
[% ELSE %]
17
    [% SET DetailPage="detail.pl" %]
18
[% END %]
19
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
20
11
21
<title>[% IF ( searchdesc ) %]Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %] &rsaquo; Catalog &rsaquo; Koha</title>
12
<title>[% IF ( searchdesc ) %]Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %] &rsaquo; Catalog &rsaquo; Koha</title>
Lines 440-446 Link Here
440
        <div id="cover-slides-[% SEARCH_RESULT.biblionumber | html %]" class="cover-slides" data-biblionumber="[% SEARCH_RESULT.biblionumber | html %]">
431
        <div id="cover-slides-[% SEARCH_RESULT.biblionumber | html %]" class="cover-slides" data-biblionumber="[% SEARCH_RESULT.biblionumber | html %]">
441
            [% IF ( LocalCoverImages ) %][% SEARCH_RESULT.localimage | html %]
432
            [% IF ( LocalCoverImages ) %][% SEARCH_RESULT.localimage | html %]
442
                <div id="local-coverimg-[% SEARCH_RESULT.biblionumber | html %]" class="cover-image local-coverimg">
433
                <div id="local-coverimg-[% SEARCH_RESULT.biblionumber | html %]" class="cover-image local-coverimg">
443
                    <a class="p1" href="/cgi-bin/koha/catalogue/[% DetailPage | html %]?biblionumber=[% SEARCH_RESULT.biblionumber |url %]">
434
                    <a href="[% PROCESS biblio_a_href biblionumber => SEARCH_RESULT.biblionumber %]" class => 'p1'>
444
                        <img src="/cgi-bin/koha/catalogue/image.pl?thumbnail=1&amp;biblionumber=[% SEARCH_RESULT.biblionumber | uri %]" alt="Local cover image" />
435
                        <img src="/cgi-bin/koha/catalogue/image.pl?thumbnail=1&amp;biblionumber=[% SEARCH_RESULT.biblionumber | uri %]" alt="Local cover image" />
445
                    </a>
436
                    </a>
446
                    <div class="hint">Local cover image</div>
437
                    <div class="hint">Local cover image</div>
Lines 449-455 Link Here
449
440
450
            [% IF ( AmazonCoverImages && SEARCH_RESULT.normalized_isbn ) %]
441
            [% IF ( AmazonCoverImages && SEARCH_RESULT.normalized_isbn ) %]
451
                <div id="amazon-bookcoverimg-[% SEARCH_RESULT.biblionumber | html %]" class="cover-image amazon-bookcoverimg">
442
                <div id="amazon-bookcoverimg-[% SEARCH_RESULT.biblionumber | html %]" class="cover-image amazon-bookcoverimg">
452
                    <a class="p1" href="/cgi-bin/koha/catalogue/[% DetailPage | html %]?biblionumber=[% SEARCH_RESULT.biblionumber |url %]">
443
                    <a href="[% PROCESS biblio_a_href biblionumber => SEARCH_RESULT.biblionumber %]" class => 'p1'>
453
                        <img src="https://images-na.ssl-images-amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn | html %].01.TZZZZZZZ.jpg" alt="Cover image from Amazon.com" />
444
                        <img src="https://images-na.ssl-images-amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn | html %].01.TZZZZZZZ.jpg" alt="Cover image from Amazon.com" />
454
                    </a>
445
                    </a>
455
                    <div class="hint">Amazon cover image</div>
446
                    <div class="hint">Amazon cover image</div>
Lines 460-466 Link Here
460
                [% coce_id = SEARCH_RESULT.normalized_ean || SEARCH_RESULT.normalized_isbn %]
451
                [% coce_id = SEARCH_RESULT.normalized_ean || SEARCH_RESULT.normalized_isbn %]
461
                [% IF ( coce_id ) %]
452
                [% IF ( coce_id ) %]
462
                    <div id="coce-coverimg-[% SEARCH_RESULT.biblionumber | html %]" class="cover-image coce-coverimg">
453
                    <div id="coce-coverimg-[% SEARCH_RESULT.biblionumber | html %]" class="cover-image coce-coverimg">
463
                        <a class="p1" href="/cgi-bin/koha/catalogue/[% DetailPage | html %]?biblionumber=[% SEARCH_RESULT.biblionumber | url %]">
454
                        <a href="[% PROCESS biblio_a_href biblionumber => SEARCH_RESULT.biblionumber %]" class => 'p1'>
464
                            <span style="block" title="[% SEARCH_RESULT.biblionumber | url %]" class="[% coce_id | html %]" id="coce-thumbnail[% SEARCH_RESULT.biblionumber | html %]"></span>
455
                            <span style="block" title="[% SEARCH_RESULT.biblionumber | url %]" class="[% coce_id | html %]" id="coce-thumbnail[% SEARCH_RESULT.biblionumber | html %]"></span>
465
                        </a>
456
                        </a>
466
                        <div class="hint">Coce cover image</div>
457
                        <div class="hint">Coce cover image</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (-17 / +3 lines)
Lines 934-956 function PopupMARCFieldDoc(field) { Link Here
934
                    </div> <!-- /.btn-group -->
934
                    </div> <!-- /.btn-group -->
935
                    [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %]
935
                    [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %]
936
                        [% IF (biblionumber) %]
936
                        [% IF (biblionumber) %]
937
                            [% IF ( BiblioDefaultViewmarc ) %]
937
                            <div class="btn-group">
938
                                <div class="btn-group">
938
                                <a href="[% PROCESS biblio_a_href biblionumber => biblionumber %]" class="btn btn-default" id="cancel">Cancel</a>
939
                                    <a class="btn btn-default" id="cancel" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblionumber |url %]">Cancel</a>
939
                            </div>
940
                                </div>
941
                            [% ELSIF ( BiblioDefaultViewlabeled_marc ) %]
942
                                <div class="btn-group">
943
                                    <a class="btn btn-default" id="cancel" href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=[% biblionumber |url %]">Cancel</a>
944
                                </div>
945
                            [% ELSIF ( BiblioDefaultViewisbd ) %]
946
                                <div class="btn-group">
947
                                    <a class="btn btn-default" id="cancel" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=[% biblionumber |url %]">Cancel</a>
948
                                </div>
949
                            [% ELSE %]
950
                                <div class="btn-group">
951
                                    <a class="btn btn-default" id="cancel" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber |url %]">Cancel</a>
952
                                </div>
953
                            [% END %]
954
                        [% ELSE %]
940
                        [% ELSE %]
955
                            <div class="btn-group">
941
                            <div class="btn-group">
956
                                <a class="btn btn-default" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a>
942
                                <a class="btn btn-default" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt (-3 / +3 lines)
Lines 31-41 Link Here
31
        <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
31
        <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
32
32
33
[% BLOCK actions %]
33
[% BLOCK actions %]
34
                        [% IF ( BiblioDefaultViewmarc ) %]
34
                        [% IF Koha.Preference('IntranetBiblioDefaultView') == 'marc' %]
35
                             <form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
35
                             <form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
36
                        [% ELSIF ( BiblioDefaultViewlabeled_marc ) %]
36
                        [% ELSIF Koha.Preference('IntranetBiblioDefaultView') == 'labeled_marc' %]
37
                             <form action="/cgi-bin/koha/catalogue/labeledMARCdetail.pl" method="post">
37
                             <form action="/cgi-bin/koha/catalogue/labeledMARCdetail.pl" method="post">
38
                        [% ELSIF ( BiblioDefaultViewisbd ) %]
38
                        [% ELSIF Koha.Preference('IntranetBiblioDefaultView') == 'isbd' %]
39
                             <form action="/cgi-bin/koha/catalogue/ISBDdetail.pl" method="post">
39
                             <form action="/cgi-bin/koha/catalogue/ISBDdetail.pl" method="post">
40
                        [% ELSE %]
40
                        [% ELSE %]
41
                             <form action="/cgi-bin/koha/catalogue/detail.pl" method="post">
41
                             <form action="/cgi-bin/koha/catalogue/detail.pl" method="post">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt (-7 / +1 lines)
Lines 71-83 Link Here
71
							<td>
71
							<td>
72
72
73
[% IF ( loopcel.reference ) %]
73
[% IF ( loopcel.reference ) %]
74
[% IF ( loopcel.BiblioDefaultViewmarc ) %]
74
    <a href="[% PROCESS biblio_a_href biblionumber => loopcel.reference %]">
75
	<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% loopcel.reference |url %]">
76
[% ELSIF ( loopcel.BiblioDefaultViewisbd ) %]
77
	<a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=[% loopcel.reference |url %]">
78
[% ELSE %]
79
	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopcel.reference |url %]">
80
 [% END %]
81
 [% END %]                                        
75
 [% END %]                                        
82
								[% IF ( loopcel.value ) %][% loopcel.value | html %][% END %]
76
								[% IF ( loopcel.value ) %][% loopcel.value | html %][% END %]
83
								[% IF ( loopcel.reference ) %]</a>[% END %]
77
								[% IF ( loopcel.reference ) %]</a>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt (-1 / +1 lines)
Lines 471-477 $(document).ready(function() { Link Here
471
                            [% END %]
471
                            [% END %]
472
                        [% END %]
472
                        [% END %]
473
                    [% END %]
473
                    [% END %]
474
                    <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view | uri %].pl?biblionumber=[% biblionumber | uri %]" title="go to [% bibliotitle | html %]">Show biblio</a></li></ul>
474
                    <li><a href="[% PROCESS biblio_a_href biblionumber => biblionumber %]" title="go to [% bibliotitle | html %]">Show biblio</a></li></ul>
475
            </aside>
475
            </aside>
476
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
476
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
477
     </div> <!-- /.row -->
477
     </div> <!-- /.row -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-1 / +1 lines)
Lines 111-117 Link Here
111
                                        <li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li>
111
                                        <li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li>
112
                                        <li><span class="label">Librarian identity:</span> [% librarian | html %]</li>
112
                                        <li><span class="label">Librarian identity:</span> [% librarian | html %]</li>
113
                                        <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li>
113
                                        <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li>
114
                                        <li><span class="label">Biblio:</span>  <a href="/cgi-bin/koha/catalogue/[% default_bib_view | uri %].pl?biblionumber=[% bibnum | uri %]">[% bibliotitle | html %]</a> <em>([% bibnum | html %])</em></li>
114
                                        <li><span class="label">Biblio:</span>  <a href="[% PROCESS biblio_a_href biblionumber => bibnum %]">[% bibliotitle | html %]</a> <em>([% bibnum | html %])</em></li>
115
                                        [% IF ( OPACBaseURL ) %]
115
                                        [% IF ( OPACBaseURL ) %]
116
                                            <li>
116
                                            <li>
117
                                                <span class="label">OPAC view:</span>
117
                                                <span class="label">OPAC view:</span>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc (+11 lines)
Lines 22-24 Link Here
22
        </div>
22
        </div>
23
    [% END %]
23
    [% END %]
24
[% END %]
24
[% END %]
25
26
[% BLOCK biblio_a_href -%]
27
    [%- IF Koha.Preference('BiblioDefaultView') == 'marc' -%]
28
        [%- SET this_biblio_href = "/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=" -%]
29
    [%- ELSIF Koha.Preference('BiblioDefaultView') == 'isbd' -%]
30
        [%- SET this_biblio_href = "/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=" -%]
31
    [%- ELSE -%]
32
        [%- SET this_biblio_href = "/cgi-bin/koha/opac-detail.pl?biblionumber=" -%]
33
    [%- END -%]
34
    [%- this_biblio_href | url %][% biblionumber | url -%]
35
[%- END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt (-1 / +1 lines)
Lines 286-292 Link Here
286
                                                <input type="checkbox" class="cb" value="[% BIBLIO_RESULT.biblionumber | html %]" name="bib[% BIBLIO_RESULT.biblionumber | html %]" id="bib[% BIBLIO_RESULT.biblionumber | html %]">
286
                                                <input type="checkbox" class="cb" value="[% BIBLIO_RESULT.biblionumber | html %]" name="bib[% BIBLIO_RESULT.biblionumber | html %]" id="bib[% BIBLIO_RESULT.biblionumber | html %]">
287
                                                </td>
287
                                                </td>
288
                                            <td>
288
                                            <td>
289
                                                <a href="#" onclick="openBiblio('[% BIBLIO_RESULT.dest | html %]',[% BIBLIO_RESULT.biblionumber | html %])">[% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT %]</a>
289
                                                <a href="#" onclick="openBiblio('[% PROCESS biblio_a_href biblionumber => BIBLIO_RESULT.biblionumber %]',[% BIBLIO_RESULT.biblionumber | html %])">[% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT %]</a>
290
                                                <!-- COinS / Openurl -->
290
                                                <!-- COinS / Openurl -->
291
                                                <span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.au=[% BIBLIO_RESULT.author | html %]&amp;rft.btitle=[% BIBLIO_RESULT.title |url %]&amp;rft.date=[% BIBLIO_RESULT.publicationyear | html %]&amp;rft.tpages=[% BIBLIO_RESULT.item('size') | html %]&amp;rft.isbn=[% BIBLIO_RESULT.isbn |url %]&amp;rft.aucorp=&amp;rft.place=[% BIBLIO_RESULT.place | html %]&amp;rft.pub=[% BIBLIO_RESULT.publisher |url %]&amp;rft.edition=[% BIBLIO_RESULT.edition | html %]&amp;rft.series=[% BIBLIO_RESULT.series | html %]&amp;rft.genre="></span>
291
                                                <span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.au=[% BIBLIO_RESULT.author | html %]&amp;rft.btitle=[% BIBLIO_RESULT.title |url %]&amp;rft.date=[% BIBLIO_RESULT.publicationyear | html %]&amp;rft.tpages=[% BIBLIO_RESULT.item('size') | html %]&amp;rft.isbn=[% BIBLIO_RESULT.isbn |url %]&amp;rft.aucorp=&amp;rft.place=[% BIBLIO_RESULT.place | html %]&amp;rft.pub=[% BIBLIO_RESULT.publisher |url %]&amp;rft.edition=[% BIBLIO_RESULT.edition | html %]&amp;rft.series=[% BIBLIO_RESULT.series | html %]&amp;rft.genre="></span>
292
                                                [% IF ( TagsInputEnabled && loggedinusername ) %]
292
                                                [% IF ( TagsInputEnabled && loggedinusername ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt (-18 / +4 lines)
Lines 45-59 Link Here
45
                    <a href="/cgi-bin/koha/opac-main.pl">Home</a>
45
                    <a href="/cgi-bin/koha/opac-main.pl">Home</a>
46
                </li>
46
                </li>
47
                <li class="breadcrumb-item">
47
                <li class="breadcrumb-item">
48
                    [% IF ( BiblioDefaultViewmarc ) %]
48
                    <a href="[% PROCESS biblio_a_href biblionumber => biblionumber %]">
49
                        <a href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber |url %]">
49
                    [% INCLUDE 'biblio-title.inc' %]</a>
50
                    [% ELSE %]
51
                        [% IF ( BiblioDefaultViewisbd ) %]
52
                            <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber |url %]">
53
                        [% ELSE %]
54
                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber |url %]">
55
                        [% END %]
56
                    [% END %][% INCLUDE 'biblio-title.inc' %]</a>
57
                </li>
50
                </li>
58
                <li class="breadcrumb-item active">
51
                <li class="breadcrumb-item active">
59
                    <a href="#" aria-current="page">Images</a>
52
                    <a href="#" aria-current="page">Images</a>
Lines 77-91 Link Here
77
                    <div class="row">
70
                    <div class="row">
78
                        <div class="col-lg-9 maincontent">
71
                        <div class="col-lg-9 maincontent">
79
                            <h1 class="title">Images for
72
                            <h1 class="title">Images for
80
                                [% IF ( BiblioDefaultViewmarc ) %]
73
                                <a class="title" href="[% PROCESS biblio_a_href biblionumber => biblionumber %]" title="View details for this title">
81
                                    <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber |url %]" title="View details for this title">
74
                                [% INCLUDE 'biblio-title.inc' %]</a> [% biblio.author | html %]
82
                                [% ELSE %]
83
                                    [% IF ( BiblioDefaultViewisbd ) %]
84
                                        <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber |url %]" title="View details for this title">
85
                                    [% ELSE %]
86
                                        <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber |url %]" title="View details for this title">
87
                                    [% END %]
88
                                [% END %][% INCLUDE 'biblio-title.inc' %]</a> [% biblio.author | html %]
89
                            </h1>
75
                            </h1>
90
                        </div> <!-- / col-lg-9 -->
76
                        </div> <!-- / col-lg-9 -->
91
                    </div> <!-- / .row -->
77
                    </div> <!-- / .row -->
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt (-8 / +2 lines)
Lines 42-54 Link Here
42
     <item>
42
     <item>
43
       <title>[% INCLUDE 'biblio-title-head.inc' biblio=SEARCH_RESULT %]</title>
43
       <title>[% INCLUDE 'biblio-title-head.inc' biblio=SEARCH_RESULT %]</title>
44
       <dc:identifier>ISBN:[% SEARCH_RESULT.isbn | html %]</dc:identifier>
44
       <dc:identifier>ISBN:[% SEARCH_RESULT.isbn | html %]</dc:identifier>
45
        [% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %]
45
        <link>[% OPACBaseURL | url %][% PROCESS biblio_a_href biblionumber => SEARCH_RESULT.biblionumber %]</link>
46
        <link>[% OPACBaseURL | url %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]</link>
47
        [% ELSIF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %]
48
        <link>[% OPACBaseURL | url %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]</link>
49
        [% ELSE %]
50
        <link>[% OPACBaseURL | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]</link>
51
        [% END %]
52
       <description><![CDATA[
46
       <description><![CDATA[
53
[% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]<img src="https://images-na.ssl-images-amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn | uri %].01.TZZZZZZZ.jpg" alt="" />[% END %][% END %]
47
[% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]<img src="https://images-na.ssl-images-amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn | uri %].01.TZZZZZZZ.jpg" alt="" />[% END %][% END %]
54
[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %]<img src="http://www.syndetics.com/index.aspx?isbn=[% SEARCH_RESULT.normalized_isbn | uri %]/SC.GIF&amp;client=[% SEARCH_RESULT.SyndeticsClientCode | uri %]&amp;type=xw10[% IF ( SEARCH_RESULT.normalized_upc ) %]&amp;upc=[% SEARCH_RESULT.normalized_upc | uri %][% END %][% IF ( SEARCH_RESULT.normalized_oclc ) %]&amp;oclc=[% SEARCH_RESULT.normalized_oclc | uri %][% END %]" alt="" />
48
[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %]<img src="http://www.syndetics.com/index.aspx?isbn=[% SEARCH_RESULT.normalized_isbn | uri %]/SC.GIF&amp;client=[% SEARCH_RESULT.SyndeticsClientCode | uri %]&amp;type=xw10[% IF ( SEARCH_RESULT.normalized_upc ) %]&amp;upc=[% SEARCH_RESULT.normalized_upc | uri %][% END %][% IF ( SEARCH_RESULT.normalized_oclc ) %]&amp;oclc=[% SEARCH_RESULT.normalized_oclc | uri %][% END %]" alt="" />
Lines 116-122 Link Here
116
   [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
110
   [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
117
   <entry>
111
   <entry>
118
     <title>[% SEARCH_RESULT.title | html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield | html %][% END %]</title>
112
     <title>[% SEARCH_RESULT.title | html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield | html %][% END %]</title>
119
     <link>[% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% END %][% END %]</link>
113
     <link>[% OPACBaseURL | url %][% PROCESS biblio_a_href biblionumber => SEARCH_RESULT.biblionumber %]</link>
120
     <!-- <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id> -->
114
     <!-- <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id> -->
121
     <updated>[% SEARCH_RESULT.timestamp | html %]</updated>
115
     <updated>[% SEARCH_RESULT.timestamp | html %]</updated>
122
     <id>[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]</id>
116
     <id>[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]</id>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt (-7 / +1 lines)
Lines 139-151 Link Here
139
                                                [% END %]
139
                                                [% END %]
140
                                                </td>
140
                                                </td>
141
                                                <td>
141
                                                <td>
142
                                                [% IF  issue.BiblioDefaultViewmarc %]
142
                                                [% INCLUDE 'biblio-title.inc' biblio=issue, link => 1 %]
143
                                                     <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% INCLUDE 'biblio-title.inc' biblio=issue %]</a>
144
                                                [% ELSIF issue.BiblioDefaultViewisbd %]
145
                                                     <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% INCLUDE 'biblio-title.inc' biblio=issue %]</a>
146
                                                [% ELSE %]
147
                                                     <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% issue.biblionumber |url %]">[% INCLUDE 'biblio-title.inc' biblio=issue %]</a>
148
                                                [% END %]
149
                                                <p class="results-summary item-details">[% issue.author | html %]</p>
143
                                                <p class="results-summary item-details">[% issue.author | html %]</p>
150
144
151
                                                    [% IF ( Koha.Preference( 'OpacStarRatings' ) == 'all' ) %]
145
                                                    [% IF ( Koha.Preference( 'OpacStarRatings' ) == 'all' ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt (-9 / +1 lines)
Lines 463-477 Link Here
463
                                                            [% IF Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') %]
463
                                                            [% IF Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') %]
464
                                                                [% SET custom_cover_image_url = itemsloo.biblio_object.custom_cover_image_url %]
464
                                                                [% SET custom_cover_image_url = itemsloo.biblio_object.custom_cover_image_url %]
465
                                                                [% IF custom_cover_image_url %]
465
                                                                [% IF custom_cover_image_url %]
466
                                                                    [% IF ( itemsloo.BiblioDefaultViewmarc ) %]
466
                                                                    <a class="custom_cover_image" href="[% PROCESS biblio_a_href biblionumber => itemsloo.biblionumber %]">
467
                                                                        <a class="custom_cover_image" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% itemsloo.biblionumber |url %]">
468
                                                                    [% ELSE %]
469
                                                                        [% IF ( itemsloo.BiblioDefaultViewisbd ) %]
470
                                                                            <a class="custom_cover_image" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% itemsloo.biblionumber |url %]">
471
                                                                        [% ELSE %]
472
                                                                            <a class="custom_cover_image" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% itemsloo.biblionumber |url %]">
473
                                                                        [% END %]
474
                                                                    [% END %]
475
                                                                    <img alt="Cover image" src="[% custom_cover_image_url | url %]" /></a>
467
                                                                    <img alt="Cover image" src="[% custom_cover_image_url | url %]" /></a>
476
                                                                [% END %]
468
                                                                [% END %]
477
                                                            [% END %]
469
                                                            [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt (-19 / +3 lines)
Lines 44-59 Link Here
44
                                <tr>
44
                                <tr>
45
                                    <td>
45
                                    <td>
46
                                        <p>
46
                                        <p>
47
                                            [% IF ( BiblioDefaultViewmarc ) %]
47
                                            <a class="title" href="[% PROCESS biblio_a_href biblionumber => review.biblionumber %]" title="View details for this title">
48
                                                <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% review.biblionumber |url %]" title="View details for this title">
48
                                                [% INCLUDE 'biblio-title.inc' biblio=review %]
49
                                            [% ELSE %]
50
                                                [% IF ( BiblioDefaultViewisbd ) %]
51
                                                    <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% review.biblionumber |url %]" title="View details for this title">
52
                                                [% ELSE %]
53
                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber |url %]#comments" title="View details for this title">
54
                                                [% END %]
55
                                            [% END %]
56
                                            [% INCLUDE 'biblio-title.inc' biblio=review %]
57
                                            </a>
49
                                            </a>
58
                                            [% IF ( review.author ) %]
50
                                            [% IF ( review.author ) %]
59
                                                by <a href="/cgi-bin/koha/opac-search.pl?q=au:[% review.author |url %]" title="Search for works by this author" class="author">[% review.author | html %]</a>
51
                                                by <a href="/cgi-bin/koha/opac-search.pl?q=au:[% review.author |url %]" title="Search for works by this author" class="author">[% review.author | html %]</a>
Lines 118-132 Link Here
118
                                        </p>
110
                                        </p>
119
                                    </td>
111
                                    </td>
120
                                    <td>
112
                                    <td>
121
                                        [% IF ( review.BiblioDefaultViewmarc ) %]
113
                                        <a class="title" href="[% PROCESS biblio_a_href biblionumber => review.biblionumber %]" title="View details for this title">
122
                                            <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% review.biblionumber |url %]" title="View details for this title">
123
                                        [% ELSE %]
124
                                            [% IF ( review.BiblioDefaultViewisbd ) %]
125
                                                <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% review.biblionumber |url %]" title="View details for this title">
126
                                            [% ELSE %]
127
                                                <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber |url %]#comments" title="View details for this title">
128
                                            [% END %]
129
                                        [% END %]
130
                                        [% IF ( OPACAmazonCoverImages ) %]
114
                                        [% IF ( OPACAmazonCoverImages ) %]
131
                                            [% IF ( review.normalized_isbn ) %]
115
                                            [% IF ( review.normalized_isbn ) %]
132
                                                <img src="https://images-na.ssl-images-amazon.com/images/P/[% review.normalized_isbn | html %].01.TZZZZZZZ.jpg" alt="" class="thumbnail" />
116
                                                <img src="https://images-na.ssl-images-amazon.com/images/P/[% review.normalized_isbn | html %].01.TZZZZZZZ.jpg" alt="" class="thumbnail" />
(-)a/opac/opac-basket.pl (-9 lines)
Lines 159-173 foreach my $biblionumber ( @bibs ) { Link Here
159
    $dat->{MARCURLS}    = $marcurlsarray;
159
    $dat->{MARCURLS}    = $marcurlsarray;
160
    $dat->{HASAUTHORS}  = $hasauthors;
160
    $dat->{HASAUTHORS}  = $hasauthors;
161
161
162
    if ( C4::Context->preference("BiblioDefaultView") eq "normal" ) {
163
        $dat->{dest} = "opac-detail.pl";
164
    }
165
    elsif ( C4::Context->preference("BiblioDefaultView") eq "marc" ) {
166
        $dat->{dest} = "opac-MARCdetail.pl";
167
    }
168
    else {
169
        $dat->{dest} = "opac-ISBDdetail.pl";
170
    }
171
    push( @results, $dat );
162
    push( @results, $dat );
172
}
163
}
173
164
(-)a/serials/checkexpiration.pl (-1 lines)
Lines 108-114 if ($date) { Link Here
108
        numsubscription     => scalar @subscriptions_loop,
108
        numsubscription     => scalar @subscriptions_loop,
109
        date                => $date,
109
        date                => $date,
110
        subscriptions_loop  => \@subscriptions_loop,
110
        subscriptions_loop  => \@subscriptions_loop,
111
        "BiblioDefaultView" . C4::Context->preference("BiblioDefaultView") => 1,
112
        searched                                                           => 1,
111
        searched                                                           => 1,
113
    );
112
    );
114
}
113
}
(-)a/serials/serials-edit.pl (-17 lines)
Lines 425-431 if ( $op and $op eq 'serialchangestatus' ) { Link Here
425
    }
425
    }
426
}
426
}
427
my $location = $serialdatalist[0]->{'location'};
427
my $location = $serialdatalist[0]->{'location'};
428
my $default_bib_view = get_default_view();
429
428
430
$template->param(
429
$template->param(
431
    subscriptionid  => $serialdatalist[0]->{subscriptionid},
430
    subscriptionid  => $serialdatalist[0]->{subscriptionid},
Lines 435-458 $template->param( Link Here
435
    bibliotitle     => $biblio->title,
434
    bibliotitle     => $biblio->title,
436
    biblionumber    => $serialdatalist[0]->{'biblionumber'},
435
    biblionumber    => $serialdatalist[0]->{'biblionumber'},
437
    serialslist     => \@serialdatalist,
436
    serialslist     => \@serialdatalist,
438
    default_bib_view => $default_bib_view,
439
    location         => $location,
437
    location         => $location,
440
    (uc(C4::Context->preference("marcflavour"))) => 1
438
    (uc(C4::Context->preference("marcflavour"))) => 1
441
439
442
);
440
);
443
output_html_with_http_headers $query, $cookie, $template->output;
441
output_html_with_http_headers $query, $cookie, $template->output;
444
445
sub get_default_view {
446
    my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
447
    my %views       = C4::Search::enabled_staff_search_views();
448
    if ( $defaultview eq 'isbd' && $views{can_view_ISBD} ) {
449
        return 'ISBDdetail';
450
    }
451
    elsif ( $defaultview eq 'marc' && $views{can_view_MARC} ) {
452
        return 'MARCdetail';
453
    }
454
    elsif ( $defaultview eq 'labeled_marc' && $views{can_view_labeledMARC} ) {
455
        return 'labeledMARCdetail';
456
    }
457
    return 'detail';
458
}
(-)a/serials/subscription-detail.pl (-19 lines)
Lines 122-129 my @irregular_issues = split /;/, $subs->{irregularity}; Link Here
122
my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subs->{periodicity});
122
my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subs->{periodicity});
123
my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern});
123
my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern});
124
124
125
my $default_bib_view = get_default_view();
126
127
my $subscription_object = Koha::Subscriptions->find( $subscriptionid );
125
my $subscription_object = Koha::Subscriptions->find( $subscriptionid );
128
$template->param(
126
$template->param(
129
    available_additional_fields => Koha::AdditionalFields->search( { tablename => 'subscription' } ),
127
    available_additional_fields => Koha::AdditionalFields->search( { tablename => 'subscription' } ),
Lines 165-189 $template->param( Link Here
165
    intranetstylesheet => C4::Context->preference('intranetstylesheet'),
163
    intranetstylesheet => C4::Context->preference('intranetstylesheet'),
166
    intranetcolorstylesheet => C4::Context->preference('intranetcolorstylesheet'),
164
    intranetcolorstylesheet => C4::Context->preference('intranetcolorstylesheet'),
167
    irregular_issues => scalar @irregular_issues,
165
    irregular_issues => scalar @irregular_issues,
168
    default_bib_view => $default_bib_view,
169
    orders_grouped => $orders_grouped,
166
    orders_grouped => $orders_grouped,
170
    (uc(C4::Context->preference("marcflavour"))) => 1,
167
    (uc(C4::Context->preference("marcflavour"))) => 1,
171
    mana_comments => $subs->{comments},
168
    mana_comments => $subs->{comments},
172
);
169
);
173
170
174
output_html_with_http_headers $query, $cookie, $template->output;
171
output_html_with_http_headers $query, $cookie, $template->output;
175
176
sub get_default_view {
177
    my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
178
    my %views       = C4::Search::enabled_staff_search_views();
179
    if ( $defaultview eq 'isbd' && $views{can_view_ISBD} ) {
180
        return 'ISBDdetail';
181
    }
182
    elsif ( $defaultview eq 'marc' && $views{can_view_MARC} ) {
183
        return 'MARCdetail';
184
    }
185
    elsif ( $defaultview eq 'labeled_marc' && $views{can_view_labeledMARC} ) {
186
        return 'labeledMARCdetail';
187
    }
188
    return 'detail';
189
}
190
- 

Return to bug 29609