Bugzilla – Attachment 95497 Details for
Bug 23590
Add the ability to change the manager of a suggestion and notify the new manager
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23590: Fix select manager on list for all tabs
Bug-23590-Fix-select-manager-on-list-for-all-tabs.patch (text/plain), 6.19 KB, created by
Jonathan Druart
on 2019-11-18 11:02:37 UTC
(
hide
)
Description:
Bug 23590: Fix select manager on list for all tabs
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2019-11-18 11:02:37 UTC
Size:
6.19 KB
patch
obsolete
>From 45558af36d5b8210605bf80c10a720548320dd89 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 13 Nov 2019 17:49:59 +0100 >Subject: [PATCH] Bug 23590: Fix select manager on list for all tabs >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Sponsored-by: BULAC - http://www.bulac.fr/ > >Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> >--- > .../prog/en/modules/suggestion/suggestion.tt | 43 +++++++++++++++------- > 1 file changed, 30 insertions(+), 13 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 8e4b9de0e2..3e6ed544b3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -393,7 +393,7 @@ > <li> > <label for="managedby_name">by:</label> > <div> >- <span id="managedby_name"> >+ <span id="managedby_name" name="managedby_name"> > <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% logged_in_user.borrowernumber | uri %]">You</a> > </span> > [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %] >@@ -679,9 +679,9 @@ > <div class="col-sm-2"> > <fieldset> > <label for="set_manager_[% loop.count %]">Update manager</label><br/> >- <a id="edit_manager" class="new_window" href="#"><i class="fa fa-search"></i> Select manager</a> >- <span id="managedby_name"></span> >- <input type="hidden" name="suggestion_managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" /> >+ <a id="set_manager_[% loop.count %]" data-tab="[% loop.count %]" class="set_manager" href="#"><i class="fa fa-search"></i> Select manager</a> >+ <span id="managedby_name[% loop.count %]"></span> >+ <input type="hidden" name="suggestion_managedby" id="managedby[% loop.count %]" value="[% logged_in_user.borrowernumber | html %]" /> > <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> > <fieldset class="action"><button type="submit" class="btn btn-default btn-xs" value="update_manager"/>Submit</button></fieldset> > </fieldset> >@@ -756,8 +756,13 @@ > </fieldset> > <fieldset class="brief"><h4 class="local_collapse"><a href="#">Suggestion information</a></h4> > <ol> >+ <li> >+ <label for="archived" style="display: inline;">Include archived:</label> >+ <input type="checkbox" id="archived" name="filter_archived" value="archived" title="Include archived suggestions in the search" /> >+ </li> > <li> > <label for="STATUS"> Status:</label> >+ > <select name="STATUS" id="STATUS"> > <option value="">Any</option> > >@@ -870,7 +875,9 @@ > [% INCLUDE 'calendar.inc' %] > > <script type="text/javascript"> >- function editManagerPopup() { >+ var tab = ''; >+ function editManagerPopup(selected_tab) { >+ tab = selected_tab; > window.open("/cgi-bin/koha/suggestion/add_user_search.pl?selection_type=select", > 'PatronPopup', > 'width=740,height=450,location=yes,toolbar=no,' >@@ -878,15 +885,17 @@ > ); > } > function select_user(borrowernumber, borrower) { >- $("#managedby_name").empty(); >- $("#managedby").val(''); >+ var managedby_name = $("#managedby_name"+tab); >+ var managedby = $("#managedby"+tab); >+ managedby_name.empty(); >+ managedby.val(''); > var borrowername = borrower.firstname + ' ' + borrower.surname; > if (borrowernumber) { > var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl' > + '?borrowernumber=' + borrowernumber + '">' > + borrowername + '</a>'; >- $('#managedby_name').html(managerlink); >- $('#managedby').val(borrowernumber); >+ managedby_name.html(managerlink); >+ managedby.val(borrowernumber); > } > > [% IF op == "save" %] >@@ -904,8 +913,14 @@ > $(document).ready(function(){ > $("#edit_manager").on("click",function(e){ > e.preventDefault(); >- editManagerPopup(); >+ editManagerPopup(''); > }); >+ $(".set_manager").on("click",function(e){ >+ e.preventDefault(); >+ var selected_tab = $(this).data('tab'); >+ editManagerPopup(selected_tab); >+ }); >+ > }); > </script> > >@@ -1006,8 +1021,9 @@ > }); > > $("button[type='submit']").on("click", function(e) { >- var form = $(this).parents("form"); >- var action = $(this).val(); >+ var submit_button = this; >+ var form = $(submit_button).parents("form"); >+ var action = $(submit_button).val(); > var selected_suggestions = $(form).find("input[name='suggestionid']:checked"); > if ( selected_suggestions.length == 0 ) { > alert(_("Please select at least one suggestion")); >@@ -1027,7 +1043,8 @@ > } > } > } else if ( action == "update_manager" ) { >- if ( $("#managedby").val() == "" ) { >+ var managedby = $(submit_button).siblings("suggestion_managedby"); >+ if ( managedby.val() == "" ) { > alert(_("Please select a manager to assign to the selected suggestions")); > e.preventDefault(); > return false; >-- >2.11.0
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 23590
:
95162
|
95163
|
95164
|
95165
|
95166
|
95167
|
95168
|
95169
|
95317
|
95318
|
95319
|
95320
|
95321
|
95322
|
95323
|
95324
|
95398
|
95399
|
95407
|
95408
|
95420
|
95421
|
95422
|
95423
|
95424
|
95425
|
95426
|
95427
|
95428
|
95429
|
95430
|
95431
|
95487
|
95488
|
95489
|
95490
|
95491
|
95492
|
95493
|
95494
|
95495
|
95496
|
95497
|
95498
|
98119
|
98120
|
98121
|
98122
|
98123
|
98124
|
98126
|
98127
|
98128
|
98129
|
98130
|
98131
|
98240
|
98267
|
98268
|
98279
|
100788
|
100789
|
100790
|
100791
|
100792
|
100793
|
100794
|
100795
|
100796
|
100797
|
100798
|
100799
|
100800
|
100801
|
100802
|
100803
|
100804
|
100846
|
100847
|
100848
|
100849
|
100850
|
100851
|
100852
|
100853
|
101539
|
101548
|
101588
|
101589
|
101590
|
101591
|
101592
|
101593
|
101594
|
101595
|
101596
|
101597
|
101598
|
101599
|
101600
|
101601
|
101602
|
101603
|
101604
|
101605
|
101606
|
101695