Bugzilla – Attachment 26509 Details for
Bug 9032
Share a list
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 9032: QA Follow-up: Loop variable and Cancel button
Bug-9032-QA-Follow-up-Loop-variable-and-Cancel-but.patch (text/plain), 3.62 KB, created by
Marcel de Rooy
on 2014-03-21 11:21:19 UTC
(
hide
)
Description:
Bug 9032: QA Follow-up: Loop variable and Cancel button
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2014-03-21 11:21:19 UTC
Size:
3.62 KB
patch
obsolete
>From f75fdbebbefdee502324e3c0422ad6bcb0abd171 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Wed, 19 Mar 2014 16:56:23 +0100 >Subject: [PATCH] Bug 9032: QA Follow-up: Loop variable and Cancel button >Content-Type: text/plain; charset=utf-8 > >To satisfy QA needs: >Use loop variable instead of $_ in opac-shareshelf.pl >Adds Cancel button to Invite form (prog and bootstrap) in opac-shareshelf.tt. >Likewise adds Return link under an error message in opac-shareshelf.tt. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > .../bootstrap/en/modules/opac-shareshelf.tt | 2 ++ > .../opac-tmpl/prog/en/modules/opac-shareshelf.tt | 2 ++ > opac/opac-shareshelf.pl | 4 ++-- > 3 files changed, 6 insertions(+), 2 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt >index 433b17a..b446252 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt >@@ -40,6 +40,7 @@ > [% IF errcode==6 %]<div class="alert">Sorry, but you did not enter any valid email address.</div>[% END %] > [% IF errcode==7 %]<div class="alert">Sorry, but we could not accept this key. The invitation may have expired. Contact the patron who sent you the invitation.</div>[% END %] > [% IF errcode==8 %]<div class="alert">As owner of a list you cannot accept an invitation for sharing it.</div>[% END %] >+ <p><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">Return to your lists</a></p> > > [% ELSIF op=='invite' %] > <div id="invite"> >@@ -57,6 +58,7 @@ > </fieldset> > <fieldset class="action"> > <input type="submit" value="Send" class="btn" /> >+ <a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves" class="cancel">Cancel</a> > </fieldset> > </form> > </div> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shareshelf.tt >index 9d00492..074425c 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shareshelf.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shareshelf.tt >@@ -21,6 +21,7 @@ > [% IF errcode==6 %]<div class="dialog alert">Sorry, but you did not enter any valid email address.</div>[% END %] > [% IF errcode==7 %]<div class="dialog alert">Sorry, but we could not accept this key. The invitation may have expired. Contact the patron who sent you the invitation.</div>[% END %] > [% IF errcode==8 %]<div class="dialog alert">As owner of a list you cannot accept an invitation for sharing it.</div>[% END %] >+ <p><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">Return to your lists</a></p> > > [% ELSIF op=='invite' %] > <form method="post" onsubmit="return $('#invite_address').val().trim()!='';"> >@@ -35,6 +36,7 @@ > > <fieldset class="action"> > <input type="submit" value="Send" /> >+ <a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves" class="cancel">Cancel</a> > </fieldset> > </form> > >diff --git a/opac/opac-shareshelf.pl b/opac/opac-shareshelf.pl >index 9e12266..97fe8b2 100755 >--- a/opac/opac-shareshelf.pl >+++ b/opac/opac-shareshelf.pl >@@ -283,8 +283,8 @@ sub stringtokey { > > sub alphabet_ordinal { > my ($char, $alphabet) = @_; >- for( 0..$#$alphabet ) { >- return $_ if $char eq $alphabet->[$_]; >+ for my $ord ( 0..$#$alphabet ) { >+ return $ord if $char eq $alphabet->[$ord]; > } > return ''; #ignore missing chars > } >-- >1.7.7.6
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 9032
:
18260
|
18542
|
18543
|
18546
|
18547
|
18587
|
18619
|
18682
|
18692
|
19377
|
19378
|
19379
|
19394
|
19934
|
19935
|
25847
|
25848
|
25849
|
25850
|
25851
|
25852
|
25853
|
25862
|
25886
|
25893
|
26253
|
26291
|
26292
|
26293
|
26294
|
26295
|
26296
|
26297
|
26298
|
26299
|
26300
|
26302
|
26303
|
26351
|
26458
|
26509
|
26513
|
26577
|
26578
|
26579
|
26580
|
26581
|
26582
|
26583
|
26584
|
26585
|
26586
|
26587
|
26588