From: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date: Thu, 29 Oct 2009 14:12:53 +0000 (+0100)
Subject: MT 1902 : routing lists presence should be shown
X-Git-Tag: v3.02.00-alpha~54^2~122
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=a9aca08a51481aba393c8741dae52f737e0280a7;p=koha.git

MT 1902 : routing lists presence should be shown

in serials-home, when showing the list of serials,
display is changed in order to display the presence of a routing list
for a subscription
---

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
index dc1aa8a2b8..1296d05021 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
@@ -72,10 +72,9 @@ Serials updated :
                 Library (Callnumber)
             </th>
             <!-- TMPL_IF NAME="routing" -->
-              <th colspan="3">&nbsp;</th>
-            <!-- TMPL_ELSE -->
-              <th colspan="2">&nbsp;</th>
+              <th >Routing list</th>
             <!-- /TMPL_IF -->        
+            <th colspan="2">&nbsp;</th>
         </tr>
         
         <!-- TMPL_LOOP name="subscriptions" -->
@@ -99,17 +98,21 @@ Serials updated :
                 <!-- TMPL_IF name="branchcode" --><!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF -->
                 <!-- TMPL_IF name="callnumber" -->(<!-- TMPL_VAR name="callnumber" -->)<!-- /TMPL_IF -->
                 </td>
-                <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Issue History</a>
-                </td>
                 <!-- TMPL_IF NAME="routing" -->
                 <td>
                 <!-- TMPL_IF NAME="cannotedit" -->
                   &nbsp;        
                 <!-- TMPL_ELSE -->
-                        <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" --><!-- TMPL_UNLESS NAME="routingedit" -->&amp;op=new<!-- /TMPL_UNLESS -->">Routing List</a>
+                    <!--TMPL_IF Name="routingedit"-->
+                        <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a>
+                	<!-- TMPL_ELSE -->
+						<a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;op=new">New</a>
+					<!--/TMPL_IF-->
                 <!-- /TMPL_IF -->
                 </td>
                 <!-- /TMPL_IF -->
+                <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Issue History</a>
+                </td>
                 <td>
                 <!-- TMPL_IF NAME="cannotedit" -->
                   &nbsp;        
diff --git a/serials/serials-home.pl b/serials/serials-home.pl
index ec2ddee948..743b7a9385 100755
--- a/serials/serials-home.pl
+++ b/serials/serials-home.pl
@@ -51,7 +51,7 @@ use C4::Context;
 my $query         = new CGI;
 my $title         = $query->param('title_filter');
 my $ISSN          = $query->param('ISSN_filter');
-my $routing       = $query->param('routing');
+my $routing       = $query->param('routing')||C4::Context->preference("RoutingSerials");
 my $searched      = $query->param('searched');
 my $biblionumber  = $query->param('biblionumber');