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 d347cb8..3e724cd 100644 (file)
--- 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 8ab7557..e8c01ed 100644 (file)
--- 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>