From: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date: Mon, 10 May 2010 09:29:34 +0000 (+0200)
Subject: MT3421, Follow-up: Moves subscription history in a separate page
X-Git-Tag: v3.00.06~8
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;ds=sidebyside;h=aafc37317da05b0ae26718ad5a51cedb87f7f580;p=koha.git

MT3421, Follow-up: Moves subscription history in a separate page

- Displays link for every subscription
 - Allows modification even for subscriptions without manual history
---

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
index d347cb8e09..3e724cdc40 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
@@ -8,9 +8,7 @@
 		<li><a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=new">Create Routing List</a></li>
 	    <!-- /TMPL_IF -->
 	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="manualhistory" -->
-	    <li><a href="subscription-history.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Subscription history</a></li>
-	<!-- /TMPL_IF -->
+	<li><a href="subscription-history.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Subscription history</a></li>
 </ul>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tmpl
index 8ab7557a02..e8c01ed085 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tmpl
@@ -15,7 +15,6 @@
    <div id="yui-main">
    <div class="yui-b">
 
-<!--TMPL_IF Name="history"-->
 <!-- TMPL_IF Name="success" -->
     <!-- TMPL_IF EXPR="success == 1" -->
 	<p>The subscription history has been successfully modified.</p>
@@ -60,9 +59,6 @@
     <fieldset class="action"><input type="submit" value="Save subscription history"  /></fieldset>
     </form>
 </div>
-<!--TMPL_ELSE-->
-    <p>Manual history is not enabled for this subscription.</p>
-<!-- /TMPL_IF -->
 </div>
 </div>