From 61db971a5d038893923c994bd3d45e99170da38c Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Fri, 14 Apr 2017 23:01:30 +0000 Subject: [PATCH] Bug 18437 - Acquisitions fund edit repair To Test: 1) Create fund. 2) Select owner. 3) Select user. 4) Select same user again. 5) Note owner does not show unless you save the changes and edit the fund again. 6) Note user can be added multiple times. 7) Apply patch. 8) Repeat stepps 1-4. 9) Note owner now shows first time. 10) Note user cannot be added multiple times. 11) Note links by owner and users have been changed to buttons. 12) Note "No owner" and "No users" messages have been added when there are none. https://bugs.koha-community.org/show_bug.cgi?id=18437 Signed-off-by: Lauren Denny --- .../prog/en/modules/admin/aqbudgets.tt | 70 +++++++++++++++------- 1 file changed, 50 insertions(+), 20 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index a3c9ee9..3af1dbe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/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 %] +     + +
    + [% IF ( budget_owner_name ) %] + + [% ELSE %] + +
    +
  • @@ -529,15 +549,25 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
  • Users:
  • -- 2.10.2