Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_10204' into 3.14-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2013-05-08 09:47:44 -04:00
commit 42ed28573e
2 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt
View file

@ -34,12 +34,13 @@
<div id="yui-main"> <div id="yui-main">
<div class="yui-b"> <div class="yui-b">
<div class="yui-g"> <form method="post" action="/cgi-bin/koha/opac-memberentry.pl" id="memberentry-form">
[% IF action == 'edit' %] [% IF action == 'edit' %]
<div id="update-account" class="container"> <div id="update-account" class="container">
[% ELSE %] [% ELSE %]
<div id="add-account" class="container"> <div id="add-account" class="container">
[% END %] [% END %]
<div class="yui-g">
[% IF action == 'edit' %] [% IF action == 'edit' %]
<h3><a href="/cgi-bin/koha/opac-user.pl">[% borrower.firstname %] [% borrower.surname %]'s account</a> &#8674; Personal details</h3> <h3><a href="/cgi-bin/koha/opac-user.pl">[% borrower.firstname %] [% borrower.surname %]'s account</a> &#8674; Personal details</h3>
[% ELSE %] [% ELSE %]
@ -60,8 +61,6 @@
<div class="dialog alert">You typed in the wrong characters in the box before submitting. Please try again.</div> <div class="dialog alert">You typed in the wrong characters in the box before submitting. Please try again.</div>
[% END %] [% END %]
<form method="post" action="/cgi-bin/koha/opac-memberentry.pl" id="memberentry-form">
[% UNLESS [% UNLESS
hidden.defined('branchcode') hidden.defined('branchcode')
%] %]
@ -93,12 +92,16 @@
</ol> </ol>
</fieldset> </fieldset>
[% END %] [% END %]
</div>
[% UNLESS [% UNLESS
hidden.defined('title') && hidden.defined('surname') && hidden.defined('firstname') && hidden.defined('title') && hidden.defined('surname') && hidden.defined('firstname') &&
hidden.defined('dateofbirth') && hidden.defined('initials') && hidden.defined('othernames') && hidden.defined('dateofbirth') && hidden.defined('initials') && hidden.defined('othernames') &&
hidden.defined('sex') hidden.defined('sex')
%] %]
<div class="yui-g">
[% IF ( display_patron_image ) %]
<div class="yui-u first">
[% END %]
<fieldset class="rows" id="memberentry_identity"> <fieldset class="rows" id="memberentry_identity">
<legend id="identity_legend">Identity</legend> <legend id="identity_legend">Identity</legend>
@ -228,8 +231,18 @@
[% END %] [% END %]
</ol> </ol>
</fieldset> </fieldset>
[% IF ( display_patron_image ) %]
</div>
<div class="yui-u">
<p class="patronimage">
<img src="/cgi-bin/koha/opac-patron-image.pl" alt="" />
</p>
</div>
[% END %]
</div>
[% END %] [% END %]
<div class="yui-g">
[% UNLESS [% UNLESS
hidden.defined('streetnumber') && hidden.defined('address') && hidden.defined('address2') && hidden.defined('streetnumber') && hidden.defined('address') && hidden.defined('address2') &&
hidden.defined('city') && hidden.defined('state') && hidden.defined('zipcode') && hidden.defined('city') && hidden.defined('state') && hidden.defined('zipcode') &&
@ -741,11 +754,9 @@
<input type="submit" value="Submit" /> <input type="submit" value="Submit" />
</fieldset> </fieldset>
[% END %] [% END %]
</div>
</form>
</div><!--/div id="update-account" --> </div><!--/div id="update-account" -->
</div> </form>
</div> </div>
</div> </div>

13
opac/opac-memberentry.pl
View file

@ -195,8 +195,19 @@ elsif ( $action eq 'update' ) {
} }
} }
elsif ( $action eq 'edit' ) { #Display logged in borrower's data elsif ( $action eq 'edit' ) { #Display logged in borrower's data
my $borrower = GetMember( borrowernumber => $borrowernumber );
$template->param( $template->param(
borrower => GetMember( borrowernumber => $borrowernumber ), ); borrower => $borrower, );
if (C4::Context->preference('OPACpatronimages')) {
my ($image, $dberror) = GetPatronImage($borrower->{cardnumber});
if ($image) {
$template->param(
display_patron_image => 1
);
}
}
} }
my $captcha = random_string("CCCCC"); my $captcha = random_string("CCCCC");