From ad3594fded5bc25d8f5e06b5487b1492884b32d8 Mon Sep 17 00:00:00 2001
From: Colin Campbell <colin.campbell@ptfs-europe.com>
Date: Thu, 8 Apr 2010 20:04:24 +0100
Subject: [PATCH] Bug 4380 Use syspref to resolve which bib display is used

Be consistent with elsewhere in cataloguing
When switching there from serials

TODO Duplicates Code Should be in a common routine
---
 .../prog/en/modules/serials/serials-edit.tmpl    |  2 +-
 .../en/modules/serials/subscription-detail.tmpl  |  2 +-
 serials/serials-edit.pl                          | 16 ++++++++++++++++
 serials/subscription-detail.pl                   | 16 ++++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
index 56ffecec08..55499875ee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
@@ -424,7 +424,7 @@ function CloneSubfield(index){
         <!--TMPL_IF name="abouttoexpire"--><a href="#" onclick="javascript:popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew <!--TMPL_VAR Name="subscriptionid"--></a>
         <!--/TMPL_IF-->
       <!--/TMPL_LOOP-->
-    <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" title="go to <!-- TMPL_VAR name="bibliotitle" -->">Show Biblio</a></li></ul>
+    <li><a href="/cgi-bin/koha/catalogue/<!-- TMPL_VAR NAME='default_bib_view' -->.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" title="go to <!-- TMPL_VAR name="bibliotitle" -->">Show Biblio</a></li></ul>
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
index 6e7b982a0e..86c3efcf61 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
@@ -82,7 +82,7 @@ function popup(subscriptionid) {
 		<li><span class="label">Subscription ID: </span><!--TMPL_VAR name="subscriptionid"--></li>
         <li><span class="label">Librarian identity:</span> <!-- TMPL_VAR name="librarian" --></li>
         <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR name="aqbooksellerid"-->"><!-- TMPL_VAR name="aqbooksellername" -->&nbsp;</a></li>
-        <li><span class="label">Biblio:</span> <i>(<!-- TMPL_VAR name="bibnum" -->)</i> <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="bibnum" -->"><!-- TMPL_VAR name="bibliotitle" --></a></li>
+        <li><span class="label">Biblio:</span> <i>(<!-- TMPL_VAR name="bibnum" -->)</i> <a href="/cgi-bin/koha/catalogue/<!-- TMPL_VAR NAME='default_bib_view' -->.pl?biblionumber=<!-- TMPL_VAR name="bibnum" -->"><!-- TMPL_VAR name="bibliotitle" --></a></li>
 <!-- TMPL_IF name="branchcode" --><li><span class="label">Library:</span> <!-- TMPL_VAR name="branchcode" -->&nbsp;</li><!-- /TMPL_IF -->
         <!-- TMPL_IF name="serialsadditems" -->
             <li>Serial receipt creates an item record.</li>
diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl
index 1ee831da23..3e2a852071 100755
--- a/serials/serials-edit.pl
+++ b/serials/serials-edit.pl
@@ -357,11 +357,27 @@ if ( $op and $op eq 'serialchangestatus' ) {
         print $query->redirect($redirect);
     }
 }
+my $default_bib_view = get_default_view();
 
 $template->param(
     serialsadditems => $serialdatalist[0]->{'serialsadditems'},
     bibliotitle     => $bibdata->{'title'},
     biblionumber    => $serialdatalist[0]->{'biblionumber'},
     serialslist     => \@serialdatalist,
+    default_bib_view => $default_bib_view,
 );
 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}) {
+        return 'ISBDdetail';
+    } elsif  ($defaultview eq 'marc' && $views->{can_view_MARC}) {
+        return 'MARCdetail';
+    } elsif  ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {
+        return 'labeledMARCdetail';
+    } else {
+        return 'detail';
+    }
+}
diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 0b8e57975d..a2b1d0c09a 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -101,6 +101,7 @@ if (! $subs->{dow}) {
 if (! $subs->{periodicity}) {
     $subs->{periodicity} = '0';
 }
+my $default_bib_view = get_default_view();
 $template->param(
 	subscriptionid => $subscriptionid,
     serialslist => \@serialslist,
@@ -118,6 +119,21 @@ $template->param(
     intranetstylesheet => C4::Context->preference('intranetstylesheet'),
     intranetcolorstylesheet => C4::Context->preference('intranetcolorstylesheet'),
     irregular_issues => scalar @irregular_issues,
+    default_bib_view => $default_bib_view,
     );
 
 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}) {
+        return 'ISBDdetail';
+    } elsif  ($defaultview eq 'marc' && $views->{can_view_MARC}) {
+        return 'MARCdetail';
+    } elsif  ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {
+        return 'labeledMARCdetail';
+    } else {
+        return 'detail';
+    }
+}
-- 
2.39.5