Bugzilla – Attachment 40514 Details for
Bug 14376
Allow the librarian to choose a patron when entering a purchase suggestion
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14376: Fix QA
Bug-14376-Fix-QA.patch (text/plain), 4.20 KB, created by
Matthias Meusburger
on 2015-06-23 09:45:02 UTC
(
hide
)
Description:
Bug 14376: Fix QA
Filename:
MIME Type:
Creator:
Matthias Meusburger
Created:
2015-06-23 09:45:02 UTC
Size:
4.20 KB
patch
obsolete
>From 2d6d0c673dac7e2b0a7768bff07c8b4aa069b373 Mon Sep 17 00:00:00 2001 >From: Matthias Meusburger <matthias.meusburger@biblibre.com> >Date: Tue, 23 Jun 2015 11:43:21 +0200 >Subject: [PATCH] Bug 14376: Fix QA > > - Add an 'edit button' > - Make the dynamic patron information more consistent with the original one > - Make the input field wider >--- > circ/ysearch.pl | 2 ++ > .../prog/en/modules/suggestion/suggestion.tt | 13 +++++++++---- > 2 files changed, 11 insertions(+), 4 deletions(-) > >diff --git a/circ/ysearch.pl b/circ/ysearch.pl >index 518915f..190a2b1 100755 >--- a/circ/ysearch.pl >+++ b/circ/ysearch.pl >@@ -29,6 +29,7 @@ use CGI qw ( -utf8 ); > use C4::Context; > use C4::Auth qw/check_cookie_auth/; > use Koha::Borrowers; >+use C4::Branch; > > use JSON qw( to_json ); > >@@ -87,6 +88,7 @@ while ( my $b = $borrowers_rs->next ) { > city => $b->city // '', > zipcode => $b->zipcode // '', > country => $b->country // '', >+ branch => C4::Branch::GetBranchName($b->branchcode) // '', > }; > } > >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 5c4ee11..573cb31 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -173,17 +173,21 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o > source: "/cgi-bin/koha/circ/ysearch.pl", > minLength: 3, > select: function( event, ui ) { >- $( "#findborrowersuggestion" ).val( ui.item.surname + ', ' + ui.item.firstname + ' (' + ui.item.cardnumber + ')' ); >+ $( "#findborrowersuggestion" ).val( ui.item.surname + ', ' + ui.item.firstname + ', ' + ui.item.branch); > $( "#suggestedby").val( ui.item.borrowernumber ); >+ $( "#findborrowersuggestion" ).attr('disabled', 'disabled'); > return false; > } > }) > .data( "ui-autocomplete" )._renderItem = function( ul, item ) { > return $( "<li></li>" ) > .data( "ui-autocomplete-item", item ) >- .append( "<a>" + item.surname + ", " + item.firstname + " (" + item.cardnumber + ") <small>" + item.address + " " + item.city + " " + item.zipcode + " " + item.country + "</small></a>" ) >+ .append( "<a>" + item.surname + ", " + item.firstname + ", " + item.branch + "</a>" ) > .appendTo( ul ); > }; >+ $( "#editborrowersuggestion" ).click(function() { >+ $( "#findborrowersuggestion" ).removeAttr('disabled').focus().select(); >+ }); > }); > // ]]> > </script> >@@ -417,9 +421,10 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o > <td> > <div class="autocomplete"> > [% IF ( suggestedby_borrowernumber ) %] >- <input autocomplete="on" id="findborrowersuggestion" name="findborrowersuggestion" size="40" class="focus" type="text" value="[% suggestedby_surname %], [% suggestedby_firstname %] [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])" /> >+ <input autocomplete="on" id="findborrowersuggestion" name="findborrowersuggestion" disabled="disabled" size="60" class="focus" type="text" value="[% suggestedby_surname %], [% suggestedby_firstname %] [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])" /> >+ <button id="editborrowersuggestion" type="button">Edit</button> > [% ELSE %] >- <input autocomplete="on" id="findborrowersuggestion" name="findborrowersuggestion" size="40" class="focus" type="text" value="" /> >+ <input autocomplete="on" id="findborrowersuggestion" name="findborrowersuggestion" size="60" class="focus" type="text" value="" /> > [% END %] > <input name="branch" value="[% Branches.GetLoggedInBranchcode() %]" type="hidden" /> > <input name="printer" value="" type="hidden" /> >-- >1.7.10.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 14376
:
40095
|
40131
|
40181
|
40202
|
40203
| 40514