Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 35329: Fix conflict with 33457

Browse source 
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Jonathan Druart 2024-03-01 16:01:13 +01:00
parent e170a3c2ab
commit 36c4d315c8
Signed by: jonathan.druart
GPG key ID: A085E712BEF0E0F0
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
View file

@ -893,9 +893,9 @@
parent_block.find(".info").hide();
parent_block.find(".error").hide();
if ( add_user(borrowernumber, borrowername) < 0 ) {
parent_block.find(".error").html(_("Patron '%s' is already in the list.").format(borrowername.escapeHtml())).show();
parent_block.find(".error").html(_("Patron '%s' is already in the list.").format(borrowername)).show();
} else {
parent_block.find(".info").html(_("Patron '%s' added.").format(borrowername.escapeHtml())).show();
parent_block.find(".info").html(_("Patron '%s' added.").format(borrowername)).show();
}
}
function modal_select_user(borrowernumber, data) {

2
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
View file

@ -1189,7 +1189,7 @@
if (ids.indexOf(borrowernumber.toString()) < 0) {
ids.push(borrowernumber);
$("#users_ids").val(ids.join(':'));
var li = '<li id="user_'+borrowernumber+'">'+borrowername.escapeHtml()
var li = '<li id="user_'+borrowernumber+'">'+borrowername
+ ' <a href="#" data-borrowernumber="'+borrowernumber+'" class="del_user"><i class="fa fa-trash-can"></i> '
+ _("Delete user") + '</a></li>';
$("#users_names").prepend(li);

2
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
View file

@ -209,7 +209,7 @@
if (ids.indexOf(borrowernumber.toString()) < 0) {
ids.push(borrowernumber);
$("#users_ids").val(ids.join(':'));
var li = '<li id="user_'+borrowernumber+'">'+borrowername.escapeHtml()
var li = '<li id="user_'+borrowernumber+'">'+borrowername
+ ' [<a style="cursor:pointer" onclick="del_user('+borrowernumber+');">'
+ _("Delete user") + '</a>]</li>';
$("#users_names").append(li);

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
View file

@ -564,7 +564,7 @@
if(borrowernumber && ids.indexOf(borrowernumber.toString()) == -1) {
var li = '<li id="user_' + borrowernumber + '">'
+ '<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber='
+ borrowernumber + '">' + borrowername.escapeHtml() + '</a> '
+ borrowernumber + '">' + borrowername + '</a> '
+ ' &bull; <a data-borrowernumber="' + borrowernumber + '" class="del_user" href="#"><i class="fa fa-trash-can"></i> '+_("Remove")+'</a> '
+ '</li>';
$("#budget_users").prepend(li);

2
koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
View file

@ -1282,7 +1282,7 @@
if (borrowernumber) {
var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
+ '?borrowernumber=' + borrowernumber + '">'
+ borrowername.escapeHtml() + '</a>';
+ borrowername + '</a>';
managedby_name.html(managerlink);
managedby.val(borrowernumber);
}