From 3b297b0e4462ae693706a439c182bb8711b0b57f Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Wed, 8 Jun 2011 09:06:36 +0100 Subject: [PATCH] Bug 6305: Subscriptions can not be edited This seems to fix the problem with editing existing subscriptions. Please test. Signed-off-by: Colin Campbell Signed-off-by: Chris Cormack --- .../prog/en/includes/serials-toolbar.inc | 4 +-- .../en/modules/serials/subscription-add.tt | 28 +++++++++---------- serials/subscription-add.pl | 12 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc index a330601a6e..3e22038e98 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -18,7 +18,7 @@ [% IF ( subscriptionid ) %] var editmenu = [ [% IF ( CAN_user_serials_edit_subscription ) %] - { text: _("Edit Subscription"), [% IF ( cannotedit ) %]disabled: true, [% END %] url: "/cgi-bin/koha/serials/subscription-add.pl?op=mod&subscriptionid=[% subscriptionid %]" }, + { text: _("Edit Subscription"), [% IF ( cannotedit ) %]disabled: true, [% END %] url: "/cgi-bin/koha/serials/subscription-add.pl?op=modify&subscriptionid=[% subscriptionid %]" }, [% END %] [% IF ( CAN_user_serials_create_subscription ) %] { text: _("Edit as New (Duplicate)"), [% IF ( cannotedit ) %]disabled: true, [% END %] url: "/cgi-bin/koha/serials/subscription-add.pl?op=dup&subscriptionid=[% subscriptionid %]" }, @@ -69,7 +69,7 @@ onclick: {fn:function(){popup([% subscriptionid %])}} [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %] [% UNLESS ( cannotedit ) %] -
  • Edit
  • +
  • Edit
  • [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt index b20ced46e6..d5d1615d7e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Serials › [% IF ( modname ) %][% bibliotitle |html %] › Modify subscription[% ELSE %]New subscription[% END %] +Koha › Serials › [% IF ( modify ) %][% bibliotitle |html %] › Modify subscription[% ELSE %]New subscription[% END %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] @@ -931,7 +931,7 @@ $(document).ready(function() { } ); // $(".widelabel").attr("width", "300px"); // labels stay skinny in IE7 anyway. -[% IF ( modname ) %] +[% IF ( modify ) %] set_num_pattern_from_template_vars(); [% IF ( hemisphere ) %] is_hemisphere = [% hemisphere %] ; @@ -952,15 +952,15 @@ $(document).ready(function() { [% INCLUDE 'header.inc' %] [% INCLUDE 'serials-search.inc' %] - +
    -

    [% IF ( modname ) %] Modify subscription for [% bibliotitle |html %][% ELSE %]Add a new subscription[% END %]

    +

    [% IF ( modify ) %] Modify subscription for [% bibliotitle |html %][% ELSE %]Add a new subscription[% END %]

    -[% IF ( modname ) %] +[% IF ( modify ) %] [% ELSE %] @@ -988,7 +988,7 @@ $(document).ready(function() { () Required
    Search for Biblio [% IF ( CAN_user_editcatalogue ) %] - [% IF ( modname ) %] + [% IF ( modify ) %] | Edit biblio [% ELSE %] | Create Biblio @@ -1107,10 +1107,10 @@ $(document).ready(function() {
    1. - [% UNLESS ( modname ) %]Show Calendar[% END %] - + [% UNLESS ( modify ) %]Show Calendar[% END %] +
    2. - [% IF ( modname ) %]
    3. + [% IF ( modify ) %]
    4. Show Calendar
    5. [% END %] @@ -1118,9 +1118,9 @@ $(document).ready(function() {