Bugzilla – Attachment 80450 Details for
Bug 15766
Give label and patron card batches a description
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15766: (follow-up) Correct merge errors
Bug-15766-follow-up-Correct-merge-errors.patch (text/plain), 2.02 KB, created by
Katrin Fischer
on 2018-10-12 06:08:25 UTC
(
hide
)
Description:
Bug 15766: (follow-up) Correct merge errors
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2018-10-12 06:08:25 UTC
Size:
2.02 KB
patch
obsolete
>From 8166021d657a58eb415b772084d82f0a3c67c175 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >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. > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../prog/en/modules/patroncards/edit-batch.tt | 26 ++++++++++++++++++++++ > 1 file changed, 26 insertions(+) > >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 5b1780a..740c663 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 >@@ -302,6 +302,32 @@ > } > }); > }); >+ $("#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")); >+ } >+ }); >+ }); > }); > </script> > [% END %] >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15766
:
59994
|
59998
|
59999
|
61462
|
61463
|
61464
|
63221
|
63222
|
63223
|
66515
|
67305
|
67862
|
68282
|
68359
|
68360
|
68361
|
68362
|
75213
|
75214
|
75215
|
75216
|
75715
|
75843
|
79839
|
79840
|
79841
|
79842
|
79843
|
79844
|
79845
|
79846
|
80446
|
80447
|
80448
|
80449
| 80450 |
80451
|
81070
|
81084
|
81086