Bugzilla – Attachment 95163 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: Clean TT variables for patrons
Bug-23590-Clean-TT-variables-for-patrons.patch (text/plain), 10.41 KB, created by
Jonathan Druart
on 2019-11-07 15:12:48 UTC
(
hide
)
Description:
Bug 23590: Clean TT variables for patrons
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2019-11-07 15:12:48 UTC
Size:
10.41 KB
patch
obsolete
>From b973a76fa4bd979eff06bba0515ecd829aaf89c1 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 6 Nov 2019 19:16:57 +0100 >Subject: [PATCH] Bug 23590: Clean TT variables for patrons > >Just a bit of cleaning >--- > .../prog/en/modules/suggestion/suggestion.tt | 34 +++++++++++----------- > suggestion/suggestion.pl | 23 ++++----------- > 2 files changed, 22 insertions(+), 35 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 956d917c46..9da2357822 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -165,9 +165,9 @@ > <th>Created by:</th> > <td>[% suggesteddate | $KohaDates %]</td> > <td> >- [% IF ( suggestedby_borrowernumber ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | uri %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> >- [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %]) >+ [% IF ( suggestedby_patron.borrowernumber ) %] >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_patron.borrowernumber | uri %]">[% suggestedby_patron.surname | html %], [% suggestedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a> >+ [% Branches.GetName( suggestedby_patron.branchcode ) | html %] ([% suggestedby_patron.category.description | html %]) > [% END %] > </td> > </tr> >@@ -175,9 +175,9 @@ > <th>Managed by:</th> > <td>[% manageddate | $KohaDates %]</td> > <td> >- [% IF ( managedby_borrowernumber ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber | uri %]">[% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> >- [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %]) >+ [% IF ( managedby_patron.borrowernumber ) %] >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_patron.borrowernumber | uri %]">[% managedby_patron.surname | html %], [% managedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a> >+ [% Branches.GetName( managedby_patron.branchcode ) | html %] ([% managedby_patron.category.description | html %]) > [% END %] > </td> > </tr> >@@ -185,9 +185,9 @@ > <th>Accepted on:</th> > <td>[% accepteddate | $KohaDates %]</td> > <td> >- [% IF ( acceptedby_borrowernumber ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber | uri %]">[% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> >- [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %]) >+ [% IF ( acceptedby_patron.borrowernumber ) %] >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_patron.borrowernumber | uri %]">[% acceptedby_patron.surname | html %], [% acceptedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a> >+ [% Branches.GetName( acceptedby_patron.branchcode ) | html %] ([% acceptedby_patron.category.description | html %]) > [% END %] > </td> > </tr> >@@ -362,13 +362,13 @@ > <tr> > <th><label for="suggesteddate">Created by:</label> </th> > <td><input type="text" id="suggesteddate" name="suggesteddate" class="datepicker" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/>[% INCLUDE 'date-format.inc' %]</td> >- <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby | html %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | uri %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %])[% END %] >+ <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby | html %]"/>[% IF ( suggestedby_patron.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_patron.borrowernumber | uri %]">[% suggestedby_patron.surname | html %], [% suggestedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a> [% Branches.GetName( suggestedby_patron.branchcode ) | html %] ([% suggestedby_patron.category.description | html %])[% END %] > </td> > </tr> > <tr> > <th><label for="accepteddate">Accepted on:</label> </th> > <td><input type="text" id="accepteddate" name="accepteddate" class="datepicker" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td> >- <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby | html %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber | uri %]">[% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %])[% END %]</td> >+ <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby | html %]"/>[% IF ( acceptedby_patron.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_patron.borrowernumber | uri %]">[% acceptedby_patron.surname | html %], [% acceptedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a> [% Branches.GetName( acceptedby_patron.branchcode ) | html %] ([% acceptedby_patron.category.description | html %])[% END %]</td> > </tr> > </tbody> > </table></li> >@@ -383,12 +383,12 @@ > <span id="managedby_name"> > <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% logged_in_user.borrowernumber | uri %]">You</a> > </span> >- [% IF managedby_borrowernumber && logged_in_user.borrowernumber != managedby_borrowernumber %] >- | Previously was [% INCLUDE 'patron-title.inc' patron=managedby_patron hide_patron_infos_if_needed=1 %] [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %]) >+ [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %] >+ | Previously was [% INCLUDE 'patron-title.inc' patron=managedby_patron hide_patron_infos_if_needed=1 %] [% Branches.GetName( managedby_patron.branchcode ) | html %] ([% managedby_patron.category.description | html %]) > [% END %] > <br /> > <a id="edit_manager" class="new_window" href="#"><i class="fa fa-search"></i> Select manager</a> >- [% IF managedby_borrowernumber && logged_in_user.borrowernumber != managedby_borrowernumber %] >+ [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %] > <a id="restore_previous_manager" href="#"><i class="fa fa-trash"></i> Keep existing manager</a> > [% END %] > <input type="hidden" name="managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" /> >@@ -1018,12 +1018,12 @@ > > $("#managedby_name").empty(); > $("#managedby").val(''); >- var borrowername = "[% managedby_firstname | html %] [% managedby_surname | html %]"; >+ var borrowername = "[% managedby_patron.firstname | html %] [% managedby_patron.surname | html %]"; > var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl' >- + '?borrowernumber=[% managedby_borrowernumber | html %]">' >+ + '?borrowernumber=[% managedby_patron.borrowernumber | html %]">' > + borrowername + '</a>'; > $('#managedby_name').html(managerlink); >- $('#managedby').val([% managedby_borrowernumber | html %]); >+ $('#managedby').val([% managedby_patron.borrowernumber | html %]); > }); > }); > </script> >diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl >index 97b9eced68..06f23e07fe 100755 >--- a/suggestion/suggestion.pl >+++ b/suggestion/suggestion.pl >@@ -329,25 +329,12 @@ if ($op=~/else/) { > ); > } > >-foreach my $element ( qw(managedby suggestedby acceptedby) ) { >-# $debug || warn $$suggestion_ref{$element}; >- if ($$suggestion_ref{$element}){ >- my $patron = Koha::Patrons->find( $$suggestion_ref{$element} ); >- my $category = $patron->category; >- $template->param( >- $element."_patron"=> $patron, >- $element."_borrowernumber"=>$patron->borrowernumber, >- $element."_firstname"=>$patron->firstname, >- $element."_surname"=>$patron->surname, >- $element."_cardnumber"=>$patron->cardnumber, >- $element."_branchcode"=>$patron->branchcode, >- $element."_description"=>$category->description, >- $element."_category_type"=>$category->category_type, >- ); >- } >-} > $template->param( >- %$suggestion_ref, >+ "${_}_patron" => scalar Koha::Patrons->find( $suggestion_ref->{$_} ) ) >+ for qw(managedby suggestedby acceptedby); >+ >+$template->param( >+ %$suggestion_ref, > "op_$op" => 1, > "op" =>$op, > ); >-- >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