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>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Owen Leonard 2018-05-31 16:54:43 +00:00 committed by Nick Clemens
parent ba8ec9bfe2
commit f4b7e470e7
1 changed files with 26 additions and 0 deletions

View File

@ -293,6 +293,32 @@
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"));
}
});
});
$("#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);