Bugzilla – Attachment 63357 Details for
Bug 12349
Link patron name on suggestions
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18154 - Show card number in detailled suggestion pages
Bug-18154---Show-card-number-in-detailled-suggesti.patch (text/plain), 11.61 KB, created by
Owen Leonard
on 2017-05-10 16:45:25 UTC
(
hide
)
Description:
Bug 18154 - Show card number in detailled suggestion pages
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2017-05-10 16:45:25 UTC
Size:
11.61 KB
patch
obsolete
>From e676d565da1cd4218cf823aea27667fa0288c075 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Sat, 6 May 2017 09:40:16 +0000 >Subject: [PATCH] Bug 18154 - Show card number in detailled suggestion pages > >This patch modifies the main suggestion management page to link patron >names to their details rather than with a "mailto:" link. > >This patch also includes the following changes: > >- A fix for Bug 18154, Show card number in suggestion details view. >- Changes for brevity to labels in the suggestion details & edit view. >- Addition of the datepicker class to date fields in the suggestion edit > view. > >https://bugs.koha-community.org/show_bug.cgi?id=12349 >--- > .../prog/en/modules/suggestion/suggestion.tt | 48 ++++++++++++++-------- > suggestion/suggestion.pl | 1 + > 2 files changed, 32 insertions(+), 17 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 62335e8..7fd229f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -262,20 +262,34 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o > <thead><tr><th> </th><th>Date</th><th>By</th></tr></thead> > <tbody> > <tr> >- <th><span class="label">Suggestion creation</span> </th> >+ <th>Created by:</th> > <td>[% suggesteddate | $KohaDates %]</td> >- <td>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a> [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])[% END %] >+ <td> >+ [% IF ( suggestedby_borrowernumber ) %] >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %] ([% suggestedby_cardnumber %])</a> >+ [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %]) >+ [% END %] > </td> > </tr> > <tr> >- <th><span class="label">Suggestion management</span> </th> >+ <th>Managed by:</th> > <td>[% manageddate | $KohaDates %]</td> >- <td>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %])[% END %]</td> >+ <td> >+ [% IF ( managedby_borrowernumber ) %] >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %] ([% suggestedby_cardnumber %])</a> >+ [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %]) >+ [% END %] >+ </td> > </tr> > <tr> >- <th><span class="label">Suggestion accepted</span> </th> >+ <th>Accepted on:</th> > <td>[% accepteddate | $KohaDates %]</td> >- <td>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])[% END %]</td> >+ <td> >+ [% IF ( acceptedby_borrowernumber ) %] >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %] ([% suggestedby_cardnumber %])</a> >+ [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %]) >+ [% END %] >+ </td> > </tr> > </tbody> > </table></li></ol> >@@ -405,20 +419,20 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o > <thead><tr><th> </th><th>Date</th><th>By</th></tr></thead> > <tbody> > <tr> >- <th><label for="suggesteddate">Suggestion creation</label> </th> >- <td><input type="text" id="suggesteddate" name="suggesteddate" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/></td> >- <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a> [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])[% END %] >+ <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 %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %] ([% suggestedby_cardnumber %])</a> [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])[% END %] > </td> > </tr> > <tr> >- <th><label for="managedon">Suggestion management</label> </th> >- <td><input type="text" id="managedon" name="manageddate" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" /></td> >- <td><input type="hidden" id="managedby" name="managedby" value="[% managedby %]"/>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %])[% END %]</td> >+ <th><label for="managedon">Managed by:</label> </th> >+ <td><input type="text" id="managedon" name="manageddate" class="datepicker" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td> >+ <td><input type="hidden" id="managedby" name="managedby" value="[% managedby %]"/>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %] ([% suggestedby_cardnumber %])</a> [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %])[% END %]</td> > </tr> > <tr> >- <th><label for="accepteddate">Suggestion accepted</label> </th> >- <td><input type="text" id="accepteddate" name="accepteddate" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" /></td> >- <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])[% END %]</td> >+ <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 %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %] ([% suggestedby_cardnumber %])</a> [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])[% END %]</td> > </tr> > </tbody> > </table></li></ol> >@@ -553,11 +567,11 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o > [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn |html %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode |html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear |html %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place |html %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle |html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) %] [% END %]<br />[% IF ( suggestions_loo.note ) %]<span class="note">[% suggestions_loo.note |html%]</span>[% END %] > </td> > <td> >- [% IF ( suggestions_loo.emailsuggestedby ) %]<a href="mailto:[% suggestions_loo.emailsuggestedby %]">[% END %][% suggestions_loo.surnamesuggestedby %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby %])[% END %] [% IF ( suggestions_loo.emailsuggestedby ) %]</a>[% END %] >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby %]">[% suggestions_loo.surnamesuggestedby %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby %])[% END %]</a> > [% IF ( suggestions_loo.suggesteddate ) %] - [% suggestions_loo.suggesteddate | $KohaDates %][% END %] > </td> > <td> >- [% IF ( suggestions_loo.emailmanagedby ) %]<a href="mailto:[% suggestions_loo.emailmanagedby %]">[% END %][% suggestions_loo.surnamemanagedby %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby %][% END %] [% IF ( suggestions_loo.emailmanagedby ) %]</a>[% END %] >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby %]">[% suggestions_loo.surnamemanagedby %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby %][% END %]</a> > [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate | $KohaDates %][% END %] > </td> > <td> >diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl >index fb97762..5c7fa0c 100755 >--- a/suggestion/suggestion.pl >+++ b/suggestion/suggestion.pl >@@ -286,6 +286,7 @@ foreach my $element ( qw(managedby suggestedby acceptedby) ) { > $element."_borrowernumber"=>$$member{borrowernumber}, > $element."_firstname"=>$$member{firstname}, > $element."_surname"=>$$member{surname}, >+ $element."_cardnumber"=>$$member{cardnumber}, > $element."_branchcode"=>$$member{branchcode}, > $element."_description"=>$$member{description}, > $element."_category_type"=>$$member{category_type} >-- >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 12349
:
63357
|
63370
|
64902