Koha-community
/
Koha
13
5
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Modified viewlog.pl to discern where it was called from and display the appropriate menu. 

If viewlog.pl is called from the circulation menu, then the circulation menu is displayed.
If viewlog.pl is called otherwise, the tools menu is displayed.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
3.0.x
Chris Nighswonger 17 years ago
committed by Joshua Ferraro
parent
734b749b5b
commit
f05e50cee2
3 changed files with 62 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 53
      koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
  2. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
  3. 27
      tools/viewlog.pl

53
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
View File

@ -2,36 +2,43 @@
<div class="patroninfo"><h5><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h5>
<ul>
<!-- TMPL_IF NAME="picture" --><li><img src="<!-- TMPL_VAR NAME="picture" -->" alt="<!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" width="100" /></li><!-- /TMPL_IF -->
<li><!-- TMPL_IF NAME="address"-->
<li><!-- TMPL_IF NAME="address"-->
<!-- TMPL_VAR NAME="address" -->
<!-- TMPL_ELSE -->
<span class="problem">No address stored for patron.</span>
<!-- /TMPL_IF --></li>
<!-- TMPL_IF NAME="address2" --><li><!-- TMPL_VAR NAME="address2" --></li><!-- /TMPL_IF -->
<li> <!-- TMPL_IF NAME="city" -->
<!-- TMPL_ELSE -->
<span class="problem">No address stored.</span>
<!-- /TMPL_IF --></li>
<!-- TMPL_IF NAME="address2" -->
<li><!-- TMPL_VAR NAME="address2" --></li>
<!-- /TMPL_IF --><li>
<!-- TMPL_IF NAME="city" -->
<!-- TMPL_VAR NAME="city" -->
<!-- TMPL_ELSE -->
No city stored.
<!-- /TMPL_IF --></li>
<li> <!--TMPL_IF NAME="phone" -->
<!-- TMPL_ELSE -->
<span class="problem">No city stored.</span>
<!-- /TMPL_IF --></li>
<li><!--TMPL_IF NAME="phone" -->
<!-- TMPL_VAR NAME="phone" -->
<!-- TMPL_ELSE -->
<!--TMPL_IF NAME="mobile" -->
<!--TMPL_IF NAME="mobile" -->
<!-- TMPL_VAR NAME="mobile" -->
<!-- TMPL_ELSE -->
<!--TMPL_IF NAME="phonepro" -->
<!-- TMPL_VAR NAME="phonepro" -->
<!-- TMPL_ELSE -->
<span class="problem">No phone stored.</span>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- /TMPL_IF --></li>
<!-- TMPL_IF NAME="email" -->
<li class="email"> <a href="mailto:<!-- TMPL_VAR NAME="email" -->" title="<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="email" --></a></li>
<!-- TMPL_ELSE -->
<!--TMPL_IF NAME="phonepro" -->
<!-- TMPL_VAR NAME="phonepro" -->
<!-- TMPL_ELSE -->
<span class="problem">No phone stored.</span>
<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --></li>
<!-- TMPL_IF NAME="email" -->
<li class="email"> <a href="mailto:<!-- TMPL_VAR NAME="email" -->" title="<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="email" --></a></li>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="emailpro" -->
<li class="email"> <a href="mailto:<!-- TMPL_VAR NAME="emailpro" -->" title="<!-- TMPL_VAR NAME="emailpro" -->"><!-- TMPL_VAR NAME="emailpro" --></a></li>
<!-- TMPL_IF NAME="emailpro" -->
<li class="email"> <a href="mailto:<!-- TMPL_VAR NAME="emailpro" -->" title="<!-- TMPL_VAR NAME="emailpro" -->"><!-- TMPL_VAR NAME="emailpro" --></a></li>
<!-- TMPL_ELSE -->
<span class="problem">No email stored.</span>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<li>Category: <!-- TMPL_VAR name="categorycode" --></li>
<li>Home Library: <!-- TMPL_IF NAME="branchcode" --><!-- TMPL_VAR NAME="branchcode" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="branch" --><!-- /TMPL_IF --></li>
<li>Home Library: <!-- TMPL_IF NAME="branchcode" --><!-- TMPL_VAR NAME="branchcode" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="branch" --><!-- /TMPL_IF --></li>
</ul></div>
<div id="menu">
<ul>
@ -43,7 +50,7 @@
<!-- TMPL_IF NAME="finesview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Fines</a></li>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="intranetreadinghistory" --><!-- TMPL_IF NAME="readingrecordview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Circulation History</a></li><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="CAN_user_parameters"--><li><a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;module=MEMBERS&amp;action=MODIFY&amp;object=<!-- TMPL_VAR NAME="borrowernumber" -->">Modification Log</a></li><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="CAN_user_parameters"--><li><a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;module=MEMBERS&amp;action=MODIFY&amp;object=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;src=circ">Modification Log</a></li><!-- /TMPL_IF -->
</ul></div>
<!-- /TMPL_IF -->

6
koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
View File

@ -182,7 +182,11 @@
</div>
</div>
<div class="yui-b">
<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
<!-- TMPL_IF NAME="menu" -->
<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
<!-- TMPL_ELSE -->
<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
<!-- /TMPL_IF -->
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

27
tools/viewlog.pl
View File

@ -53,6 +53,7 @@ my $basename = $input->param("basename");
my $mime = $input->param("MIME");
my $del = $input->param("sep");
my $output = $input->param("output") || "screen";
my $src = $input->param("src"); # this param allows us to be told where we were called from -fbcit
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
{
@ -65,6 +66,32 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
}
);
warn "Source of call was $src";
if ($src eq 'circ') { # if we were called from circulation, use the circulation menu and get data to populate it -fbcit
use C4::Members;
my $borrowernumber = $object;
my $data = GetMember($borrowernumber,'borrowernumber');
my $picture = GetPatronImage($data->{'cardnumber'});
$template->param( menu => 1,
title => $data->{'title'},
initials => $data->{'initials'},
surname => $data->{'surname'},
borrowernumber => $borrowernumber,
firstname => $data->{'firstname'},
cardnumber => $data->{'cardnumber'},
categorycode => $data->{'categorycode'},
address => $data->{'address'},
address2 => $data->{'address2'},
city => $data->{'city'},
phone => $data->{'phone'},
phonepro => $data->{'phonepro'},
email => $data->{'email'},
branchcode => $data->{'branchcode'},
picture => $picture,
);
}
$template->param(
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
dateformat => C4::Dates->new()->format(),

Write Preview
Loading…
Cancel
Save