@@ -, +, @@ --- .../prog/en/modules/admin/aqbudgets.tt | 70 +++++++++++++++------- 1 file changed, 50 insertions(+), 20 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -42,22 +42,29 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") + borrowername + ''; $('#budget_owner_name').html(ownerlink); $('#budget_owner_id').val(borrowernumber); + $('#remove_owner').show(); } } function ownerRemove() { - $('#budget_owner_name').empty(); + $('#budget_owner_name').html('No owner'); $('#budget_owner_id').val(''); + $('#remove_owner').hide(); } function add_user(borrowernumber, borrowername) { - var ids = $("#budget_users_id").val().split(':'); - if(borrowernumber && ids.indexOf(borrowernumber) == -1) { + var ids = $.map($("#budget_users_id").val().split(':'), function(value){ return parseInt(value,10)}); + if ( borrowernumber && !ids.includes(borrowernumber) ) { var li = '
  • ' - + '' + borrowername + ' ' - + ' • Remove ' + + '' + borrowername + '' + + '   ' + + '
    ' + + ' Remove ' + + '
    ' + '
  • '; + if ( $("li#user_none") ) { + $("li#user_none").remove(); + } $("#budget_users").prepend(li); ids.push(borrowernumber); $("#budget_users_id").val(ids.join(':')); @@ -75,6 +82,9 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") ids.splice(idx, 1); $("#budget_users_id").val(ids.join(':')); $("li#user_" + borrowernumber).remove(); + if ( ids == '' ) { + $("#budget_users").prepend('
  • No users
  • '); + } } } } @@ -502,17 +512,27 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
  • Owner: - [% IF ( budget_owner_name ) %] - + + [% IF ( budget_owner_name ) %] [% budget_owner_name %] - | - - [% END %] - Select owner - Remove owner - + + [% ELSE %] + No owner + [% END %] +     +
    + Select +
    +
    + [% IF ( budget_owner_name ) %] + + [% ELSE %] + +
    +
  • @@ -529,15 +549,25 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
  • Users:
  • --