df87f507d9
This patch adds information about cron jobs performed and make it viewable
under Home > Tools > Logs ("Browse system logs")
To test:
Apply patch
- Got to system preferences and set 'CronjobLog' to: [Log] information from
cron jobs.
- Run some cron jobs
- Go to Home > Tools > Logs
- Verify that you have a selection 'Cron jobs' in drop-down 'Module'. Select it
with Action "All" and Submit.
- Output should show Date/time and info about Cron jobs
Rebased to work on top of Bug 6911 (conflict in viewlog.tt) /MV
Rebased after applying patch for Bug 6911 /MV
Conflicts resolved:
misc/cronjobs/overdue_notices.pl
misc/cronjobs/cleanup_database.pl
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
- Merge both patches, and fix updatedatabase.pl
- Works as described. Provide intersting feedback from cronjob scripts.
--
Modified version taking in account syspref CronJobLog. Handling simplified by introducing a convenience sub cronlogaction in C4/Log.pm /MV
Amended to take in account comments #11, #12, #13 /MV
http://bugs.koha-community.org/show_bug.cgi?id=13899
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
237 lines
12 KiB
Text
237 lines
12 KiB
Text
[% USE Koha %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>
|
|
Koha › Tools ›
|
|
[% IF ( do_it ) %]
|
|
Logs › Results
|
|
[% ELSE %]
|
|
Logs
|
|
[% END %]
|
|
</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% INCLUDE 'calendar.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 'CIRCULATION' %]Circulation
|
|
[% CASE 'LETTER' %]Letter
|
|
[% CASE 'FINES' %]Fines
|
|
[% CASE 'SYSTEMPREFERENCE' %]System prefs
|
|
[% CASE 'CRONJOBS' %]Cron jobs
|
|
[% 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 %][% action %]
|
|
[% 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 %]" />
|
|
<fieldset class="rows">
|
|
<ol>
|
|
<li>
|
|
<label for="user">Librarian:</label>
|
|
<input type="text" name="user" id="user" value="[% user %]" />
|
|
</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' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS' ] %]
|
|
[% 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' 'CREATE' ] %]
|
|
[% 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 %]" />
|
|
</li>
|
|
<li>
|
|
<label for="info">Info:</label>
|
|
<input type="text" id="info" name="info" value="[% info %]" />
|
|
</li>
|
|
<li>
|
|
<label for="from"> Display from: </label> <input type="text" size="10" id="from" name="from" value="[% datefrom %]" 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 %]" 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>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH loopro IN looprow %]
|
|
[% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
|
|
<td>[% loopro.timestamp %]</td>
|
|
<td>
|
|
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.user %]" title="display detail for this librarian."> [% IF ( loopro.userfirstname ) || ( loopro.usersurname ) %][% loopro.userfirstname %] [% loopro.usersurname %] ([% loopro.user %]) [% ELSE %][% loopro.user %][% END %]</a>
|
|
</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' ) %]
|
|
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> [% IF ( loopro.object ) %][% IF ( loopro.borrowerfirstname ) || ( loopro.borrowersurname ) %][% loopro.borrowerfirstname %] [% loopro.borrowersurname %] ([% loopro.object %]) [% ELSE %]Member [% loopro.object %][% END %][% END %] </a>
|
|
[% 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>
|
|
</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 %]">Bibliographic record [% object %]</a>
|
|
[% END %]
|
|
[% IF ( MEMBERS ) %]
|
|
for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% object %]">[% 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>
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|