Jonathan Druart
0ab22e1c7c
In order to simplify and make uniform the code, the controller scripts send a Koha::Patron object to the templates instead of all attributes of a patron. That will make the code much more easier to maintain and will be less error-prone. The variable "patron" sent to the templates is supposed to represent the patron the librarian is editing the detail. In the members module and some scripts of the circulation module, the patron's detail are sent one by one to the template. That leads to frustration from developpers (making sure everything is passed from all scripts) and to regression (we got tone of bugs in the last year because of this way to do). With this patch set it will be easy access patron's detail, passing only 1 variable from the controllers. Test plan: Play with the patron and circulation module and make sur the detail of the patron you are editing/seeing info are correctly displayed. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
294 lines
15 KiB
Text
294 lines
15 KiB
Text
[% USE Koha %]
|
|
[% USE AuthorisedValues %]
|
|
[% USE Branches %]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>
|
|
Koha › Tools ›
|
|
[% IF ( do_it ) %]
|
|
Logs › Results
|
|
[% ELSE %]
|
|
Logs
|
|
[% END %]
|
|
</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
</head>
|
|
|
|
<body id="tools_viewlog" class="tools">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'cat-search.inc' %]
|
|
|
|
[% BLOCK translate_log_module %]
|
|
[% SWITCH module %]
|
|
[% CASE 'CATALOGUING' %]Catalog
|
|
[% CASE 'AUTHORITIES' %]Authorities
|
|
[% CASE 'MEMBERS' %]Patrons
|
|
[% CASE 'ACQUISITIONS' %]Acquisitions
|
|
[% CASE 'SERIAL' %]Serials
|
|
[% CASE 'HOLDS' %]Holds
|
|
[% CASE 'CIRCULATION' %]Circulation
|
|
[% CASE 'LETTER' %]Letter
|
|
[% CASE 'FINES' %]Fines
|
|
[% CASE 'SYSTEMPREFERENCE' %]System prefs
|
|
[% CASE 'CRONJOBS' %]Cron jobs
|
|
[% CASE 'REPORTS' %]Reports
|
|
[% CASE %][% module %]
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% BLOCK translate_log_action %]
|
|
[% SWITCH action %]
|
|
[% CASE 'ADD' %]Add
|
|
[% CASE 'DELETE' %]Delete
|
|
[% CASE 'MODIFY' %]Modify
|
|
[% CASE 'ISSUE' %]Checkout
|
|
[% CASE 'RETURN' %]Return
|
|
[% CASE 'CREATE' %]Create
|
|
[% CASE 'CANCEL' %]Cancel
|
|
[% CASE 'RESUME' %]Resume
|
|
[% CASE 'SUSPEND' %]Suspend
|
|
[% CASE 'RENEW' %]Renew
|
|
[% CASE 'CHANGE PASS' %]Change password
|
|
[% CASE 'ADDCIRCMESSAGE' %]Add circulation message
|
|
[% CASE 'DELCIRCMESSAGE' %]Delete circulation message
|
|
[% CASE 'Run' %]Run
|
|
[% CASE %][% action %]
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% BLOCK translate_log_interface %]
|
|
[% SWITCH log_interface %]
|
|
[% CASE 'INTRANET' %]Intranet
|
|
[% CASE 'OPAC' %]OPAC
|
|
[% CASE 'SIP' %]SIP
|
|
[% CASE 'COMMANDLINE' %]Command-line
|
|
[% CASE %][% log_interface %]
|
|
[% END %]
|
|
[% END %]
|
|
|
|
<div id="breadcrumbs">
|
|
<a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> ›
|
|
[% IF ( do_it ) %]
|
|
<a href="/cgi-bin/koha/tools/viewlog.pl">Logs</a> › Results
|
|
[% ELSE %]
|
|
Logs
|
|
[% END %]
|
|
</div>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
[% IF ( CAN_user_reports ) %]
|
|
<h1>Browse system logs</h1>
|
|
<form method="post" action="/cgi-bin/koha/tools/viewlog.pl">
|
|
[% IF ( do_it ) %]
|
|
<input type="hidden" name="do_it" value="[% do_it %]" />
|
|
[% END %]
|
|
<input type="hidden" name="src" value="[% src | html %]" />
|
|
<fieldset class="rows">
|
|
<ol>
|
|
<li>
|
|
<label for="user">Librarian:</label>
|
|
<input type="text" name="user" id="user" value="[% user | html %]" />
|
|
</li>
|
|
<li>
|
|
<label for="modules">Modules:</label>
|
|
<select name="modules" id="modules" multiple="multiple">
|
|
[% UNLESS modules %]
|
|
<option value="" selected="selected">All</option>
|
|
[% ELSE %]
|
|
<option value="">All</option>
|
|
[% END %]
|
|
[% FOREACH modx IN [ 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS' ] %]
|
|
[% IF modules.grep(modx).size %]
|
|
<option value="[% modx %]" selected="selected">[% PROCESS translate_log_module module=modx %]</option>
|
|
[% ELSE %]
|
|
<option value="[% modx %]">[% PROCESS translate_log_module module=modx %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
<li>
|
|
<label for="actions">Actions:</label>
|
|
<select name="actions" id="actions" multiple="multiple">
|
|
[% UNLESS actions %]
|
|
<option value="" selected="selected">All</option>
|
|
[% ELSE %]
|
|
<option value="">All</option>
|
|
[% END %]
|
|
|
|
[% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'CHANGE PASS' 'Run' ] %]
|
|
[% IF actions.grep(actx).size %]
|
|
<option value="[% actx %]" selected="selected">[% PROCESS translate_log_action action=actx %]</option>
|
|
[% ELSE %]
|
|
<option value="[% actx %]">[% PROCESS translate_log_action action=actx %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
<li>
|
|
<label for="object">Object: </label>
|
|
<input type="text" id="object" name="object" value="[% object | html %]" />
|
|
</li>
|
|
<li>
|
|
<label for="info">Info:</label>
|
|
<input type="text" id="info" name="info" value="[% info | html %]" />
|
|
</li>
|
|
<li>
|
|
<label for="interfaces">Interface:</label>
|
|
<select name="interfaces" id="interfaces" multiple="multiple">
|
|
[% UNLESS interfaces %]
|
|
<option value="" selected="selected">All</option>
|
|
[% ELSE %]
|
|
<option value="">All</option>
|
|
[% END %]
|
|
|
|
[% FOREACH interf IN [ 'INTRANET' 'OPAC' 'SIP' 'COMMANDLINE' ] %]
|
|
[% IF interfaces.grep(interf).size %]
|
|
<option value="[% interf %]" selected="selected">[% PROCESS translate_log_interface log_interface=interf %]</option>
|
|
[% ELSE %]
|
|
<option value="[% interf %]">[% PROCESS translate_log_interface log_interface=interf %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
<li>
|
|
<label for="from"> Display from: </label> <input type="text" size="10" id="from" name="from" value="[% datefrom | html %]" class="datepickerfrom" />
|
|
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
|
|
</li>
|
|
<li>
|
|
<label for="to">Display to: </label> <input size="10" id="to" name="to" type="text" value="[% dateto | html %]" class="datepickerto" />
|
|
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
<fieldset class="rows">
|
|
<legend>Output</legend>
|
|
<ol>
|
|
<li>
|
|
<label for="screen" >To screen in the browser:</label> <input id="screen" type="radio" checked="checked" name="output" value="screen" />
|
|
</li>
|
|
<li>
|
|
<label for="file">To a file:</label>
|
|
<input id="file" type="radio" name="output" value="file" />
|
|
<label class="inline" for="basename">Named:</label>
|
|
<input type="text" name="basename" id="basename" value="Export" />
|
|
<!--
|
|
<label for="MIME" class="inline">Into an application:</label>
|
|
[% CGIextChoice %]
|
|
[% CGIsepChoice %]
|
|
-->
|
|
<input type="hidden" name="report_name" value="[% report_name %]" />
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
<fieldset class="action">
|
|
<input type="submit" value="Submit" />
|
|
<input type="hidden" name="do_it" value="1" />
|
|
</fieldset>
|
|
</form>
|
|
[% END %]
|
|
[% IF ( do_it ) %]
|
|
[% IF ( total ) %]
|
|
<h4>[% total %] lines found.</h4>
|
|
<table>
|
|
<thead>
|
|
<tr>
|
|
<th>Date</th>
|
|
<th>Librarian</th>
|
|
<th>Module</th>
|
|
<th>Action</th>
|
|
<th>Object</th>
|
|
<th>Info</th>
|
|
<th>Interface</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH loopro IN looprow %]
|
|
<tr>
|
|
<td>[% loopro.timestamp %]</td>
|
|
<td>
|
|
[% IF loopro.librarian %]
|
|
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.librarian.borrowernumber %]" title="display detail for this librarian."> [% IF ( loopro.librarian.firstname ) || ( loopro.librarian.surname ) %][% loopro.librarian.firstname %] [% loopro.librarian.surname %] ([% loopro.librarian.borrowernumber %]) [% ELSE %][% loopro.librarian.borrowernumber %][% END %]</a>
|
|
[% ELSE %]
|
|
[% loopro.user %]
|
|
[% END %]
|
|
</td>
|
|
<td>[% PROCESS translate_log_module module=loopro.module %]</td>
|
|
<td>[% PROCESS translate_log_action action=loopro.action %]</td>
|
|
<td>
|
|
[% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %]
|
|
[% IF loopro.patron %]
|
|
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> [% IF ( loopro.object ) %][% IF ( loopro.patron.firstname ) || ( loopro.patron.surname ) %][% loopro.patron.firstname %] [% loopro.patron.surname %] ([% loopro.object %]) [% ELSE %]Member [% loopro.object %][% END %][% END %] </a>
|
|
[% ELSE %]
|
|
[% loopro.object %]
|
|
[% END %]
|
|
[% ELSE %]
|
|
[% IF ( loopro.module == 'CATALOGUING' ) %]
|
|
[% IF ( loopro.info.substr(0, 4) == 'item' ) %]
|
|
<a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.object %]&biblionumber=[% loopro.biblionumber %]&bi=[% loopro.biblioitemnumber %]#item[% loopro.object %]">Item [% loopro.object %]</a>
|
|
[% ELSIF ( loopro.info.substr(0, 6) == 'biblio' ) %]
|
|
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.object %]" title="Display detail for this biblio">Biblio [% loopro.object %]</a>
|
|
[% ELSE %]
|
|
[% loopro.object %]
|
|
[% END %]
|
|
[% ELSE %]
|
|
[% IF ( loopro.module == 'SERIAL' ) %]
|
|
<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% loopro.object %]">Subscription [% loopro.object %] </a>
|
|
[% ELSE %]
|
|
[% IF ( loopro.module == 'AUTHORITIES' ) %]
|
|
<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% loopro.object %]" title="Display detail for this authority">Authority [% loopro.object %]</a>
|
|
[% ELSE %]
|
|
[% loopro.object %]
|
|
[% END %]
|
|
[% END %]
|
|
[% END %]
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
[% IF ( loopro.module == 'CIRCULATION' ) %]
|
|
<a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% loopro.info %]&biblionumber=[% loopro.biblionumber %]&bi=[% loopro.biblioitemnumber %]#item[% loopro.info %]" title="Display detail for this item">Item [% loopro.barcode |html %]</a>
|
|
[% ELSE %]
|
|
[% loopro.info |html %]
|
|
[% END %]
|
|
</td>
|
|
<td>[% PROCESS translate_log_interface log_interface=loopro.interface %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
[% ELSE %]
|
|
<div class="dialog alert">
|
|
No log found
|
|
[% IF ( CATALOGUING ) %]
|
|
for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% object | url %]">Bibliographic record [% object | html %]</a>
|
|
[% END %]
|
|
[% IF ( MEMBERS ) %]
|
|
for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% object | url %]">[% INCLUDE 'patron-title.inc' %]</a>
|
|
[% END %]
|
|
.
|
|
</div>
|
|
[% END %]
|
|
[% END %]
|
|
</div>
|
|
</div>
|
|
<div class="yui-b noprint">
|
|
[% IF ( menu ) %]
|
|
[% INCLUDE 'circ-menu.inc' %]
|
|
[% ELSE %]
|
|
[% IF ( CATALOGUING ) %]
|
|
[% INCLUDE 'biblio-view-menu.inc' %]
|
|
[% ELSE %]
|
|
[% INCLUDE 'tools-menu.inc' %]
|
|
[% END %]
|
|
[% END %]
|
|
</div>
|
|
</div>
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% INCLUDE 'calendar.inc' %]
|
|
<script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script>
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|