From 37f36f51e646c9bc5dea180d6517bcdd885845bd Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 31 May 2018 16:54:43 +0000 Subject: [PATCH] Bug 15766: (follow-up) Correct merge errors This patch corrects some problems applying this on current master and removes an old merge conflict marker. --- .../prog/en/modules/patroncards/edit-batch.tt | 213 +++------------------ 1 file changed, 26 insertions(+), 187 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt index 37861c8..7965a91 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -4,193 +4,6 @@ Koha › Tools › Patron card creator › Batches › [% IF batch_id %]Edit ([% batch_id %])[% ELSE %]New[% END %] [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/datatables.css") %] - [% INCLUDE 'greybox.inc' %] - - [% INCLUDE 'datatables.inc' %] - ->>>>>>> Bug 15766: Adding descriptions to patron card batches @@ -457,6 +270,32 @@ var batch_id = $(this).data("batch-id"); GB_showCenter( _("Export single card"),'/cgi-bin/koha/patroncards/print.pl?batch_id='+batch_id+'&label_id='+label_id, 400, 800); }); + $("#savedesc").click(function(event){ + var newdescription = $(this).siblings('input[name="description"]').val(); + var batch_id = $(this).data('batch_id'); + var ajaxData = { + 'newdescription': newdescription, + 'batch_id': batch_id, + 'card_element': "batch", + 'creator': "patroncard", + }; + + $.ajax({ + url: '/cgi-bin/koha/svc/creator_batches', + type: 'POST', + dataType: 'json', + data: ajaxData, + }) + + .done(function(data){ + if (data.status == 'success') { + $("input[name='description']").text(data.newdesc); + $("#change-status").text(_("Saved")); + } else { + $("#change-status").text(_("Unable to save description")); + } + }); + }); }); [% END %] -- 2.1.4