From: Ryan Higgins <rch@liblime.com>
Date: Wed, 23 Jul 2008 20:04:37 +0000 (-0500)
Subject: Combine 'publication details' and volume columns in display to work with mixed serial... 
X-Git-Tag: ffzg~69
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=1dcf4c5e9ec8094d35f70f9eb3a48acb3f48262d;p=koha.git

Combine 'publication details' and volume columns in display to work with mixed serial data (i.e. some issues linked to serials module, some not). Cleans up display after patch to update sorting with enumchron based on biblio.serial.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 24ce4514cd..091a1ea7ac 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -167,6 +167,7 @@ $template->param(
 	itemdata_ccode      => $itemfields{ccode},
 	itemdata_enumchron  => $itemfields{enumchron},
 	itemdata_copynumber => $itemfields{copynumber},
+	volinfo				=> $itemfields{enumchron} || $dat->{'serial'} ,
 );
 
 my @results = ( $dat, );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 2fd010bf71..26ea4ea1a6 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -164,9 +164,7 @@ function verify_images() {
                 <th>Status</th>
                 <th>Last seen</th>
                 <th>Barcode</th>
-                <!-- TMPL_IF NAME="itemdata_enumchron" --><th>Publication Details</th>
-				<!-- TMPL_ELSIF NAME="serial" --><th>Volume</th>
-				<!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="volinfo" --><th>Publication Details</th><!-- /TMPL_IF -->
                 <!-- TMPL_IF NAME="itemdata_copynumber" --><th>Copy No.</th><!-- /TMPL_IF -->
             </tr>
             <!-- TMPL_LOOP NAME="itemloop" -->
@@ -249,11 +247,14 @@ function verify_images() {
                     </td>
                     <td class="datelastseen"><!-- TMPL_VAR NAME="datelastseen" --></td>
                     <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber">"><!-- TMPL_VAR NAME="barcode" --></a></td>
-				<!-- TMPL_IF NAME="itemdata_enumchron" -->
-					<td class="enumchron"><!-- TMPL_VAR NAME="enumchron" --></td>
-                <!-- TMPL_ELSIF NAME="serial" -->
-					<td class="serialseq"><!-- TMPL_VAR NAME="serialseq" --><!-- TMPL_IF NAME="publisheddate" --> (<!-- TMPL_VAR NAME="publisheddate" -->)<!-- /TMPL_IF --></td>
-				<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="volinfo" -->	<td class="enumchron">
+					<!-- TMPL_IF NAME="itemdata_enumchron" -->
+						<!-- TMPL_IF NAME="enumchron" -->
+						<!-- TMPL_VAR NAME="enumchron" --><!-- TMPL_IF NAME="serialseq" --> -- <!-- /TMPL_IF -->
+						<!-- /TMPL_IF -->
+					<!-- /TMPL_IF -->
+					<!-- TMPL_VAR NAME="serialseq" --><!-- TMPL_IF NAME="publisheddate" --> (<!-- TMPL_VAR NAME="publisheddate" -->)<!-- /TMPL_IF -->
+				</td><!-- /TMPL_IF -->
 				<!-- TMPL_IF NAME="itemdata_copynumber" -->
 					<td class="copynumber"><!-- TMPL_VAR NAME="copynumber" --></td>
 				<!-- /TMPL_IF -->