Bugzilla – Attachment 62536 Details for
Bug 18437
Acquisitions fund edit repair
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[BUG 18437] Fix selects / change links to buttons
BUG-18437-Fix-selects--change-links-to-buttons.patch (text/plain), 6.33 KB, created by
Christopher Brannon
on 2017-04-21 15:58:29 UTC
(
hide
)
Description:
[BUG 18437] Fix selects / change links to buttons
Filename:
MIME Type:
Creator:
Christopher Brannon
Created:
2017-04-21 15:58:29 UTC
Size:
6.33 KB
patch
obsolete
>From 50dba4abc9fc3027d36f94d00286898e7d66b781 Mon Sep 17 00:00:00 2001 >From: Christopher Brannon <cbrannon@cdalibrary.org> >Date: Fri, 14 Apr 2017 23:01:30 +0000 >Subject: [PATCH] [BUG 18437] Fix selects / change links to buttons > >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. >--- > .../prog/en/modules/admin/aqbudgets.tt | 63 +++++++++++++++------- > 1 file changed, 43 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..4f8ced3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -46,18 +46,23 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") > } > > function ownerRemove() { >- $('#budget_owner_name').empty(); >+ $('#budget_owner_name').html('No owner'); > $('#budget_owner_id').val(''); > } > > 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 = '<li id="user_' + borrowernumber + '">' >- + '<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=' >- + borrowernumber + '">' + borrowername + '</a> ' >- + ' • <a data-borrowernumber=" + borrowernumber +" class="del_user" href="#"><i class="fa fa-trash"></i> Remove</a> ' >+ + '<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=' + borrowernumber + '">' + borrowername + '</a>' >+ + ' ' >+ + '<div class="btn-group">' >+ + '<a class="btn btn-default btn-xs del_user" title="Remove this user" data-borrowernumber=" + borrowernumber +" href="#"><i class="fa fa-trash"></i> Remove</a> ' >+ + '</div>' > + '</li>'; >+ if ( $("li#user_none") ) { >+ $("li#user_none").remove(); >+ } > $("#budget_users").prepend(li); > ids.push(borrowernumber); > $("#budget_users_id").val(ids.join(':')); >@@ -75,6 +80,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('<li id="user_none">No users</li>'); >+ } > } > } > } >@@ -502,17 +510,22 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") > > <li> > <span class="label">Owner: </span> >- [% IF ( budget_owner_name ) %] >- <span id="budget_owner_name"> >+ <span id="budget_owner_name"> >+ [% IF ( budget_owner_name ) %] > <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner_id %]"> > [% budget_owner_name %] >- </a> | >- </span> >- [% END %] >- <a id="edit_owner" class="new_window" href="#"><i class="fa fa-search"></i> Select owner</a> >- <a id="remove_owner" href="#"><i class="fa fa-trash"></i> Remove owner</a> >- <input type="hidden" name="budget_owner_id" id="budget_owner_id" >- value="[% budget_owner_id %]" /> >+ </a> >+ [% ELSE %] >+ No owner >+ [% END %] >+ </span> >+ <div class="btn-group"> >+ <a id="edit_owner" class="btn btn-default btn-xs new windows" title="Select/Change fund owner" href="#"><i class="fa fa-search"></i> Select </a> >+ </div> >+ <div class="btn-group"> >+ <a id="remove_owner" class="btn btn-default btn-xs" title="Remove fund owner" href="#"></i> Remove </a> >+ </div> >+ <input type="hidden" name="budget_owner_id" id="budget_owner_id" value="[% budget_owner_id %]" /> > </li> > > >@@ -529,15 +542,25 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") > <li> > <span class="label">Users:</span> > <ul style="float:left;" id="budget_users"> >+ [% IF !budget_users %] >+ <li id="user_none"> >+ No users >+ </li> >+ [% END %] > [% FOREACH user IN budget_users %] > <li id="user_[% user.borrowernumber %]"> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% user.borrowernumber %]"> >- [% user.firstname %] [% user.surname %] >- </a> >- • <a href="#" class="del_user" data-borrowernumber="[% user.borrowernumber %]"><i class="fa fa-trash"></i> Remove</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% user.borrowernumber %]"> [% user.firstname %] [% user.surname %] </a> >+ >+ <div class="btn-group"> >+ <a class="btn btn-default btn-xs del_user" title="Remove this user" data-borrowernumber="[% user.borrowernumber %]" href="#"><i class="fa fa-trash"></i> Remove</a> >+ </div> > </li> > [% END %] >- <li><a href="#" id="add_user_button"><i class="fa fa-plus"></i> Add users</a></li> >+ <li> >+ <div class="btn-group"> >+ <a id="add_user_button" class="btn btn-default btn-xs" title="Add new users" href="#"><i class="fa fa-plus"></i> Add users</a> >+ </div> >+ </li> > </ul> > <input type="hidden" name="budget_users_ids" id="budget_users_id" value="[% budget_users_ids %]" /> > </li> >-- >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 18437
:
62185
|
62341
|
62534
|
62536
|
62560
|
62561
|
66772