Bugzilla – Attachment 5546 Details for
Bug 6460
No log generated if Action set to All or Modify or Delete
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6460: alternative fix, updating template and script instead of C4::Log - a bit rushed
Bug-6460-alternative-fix-updating-template-and-scr.patch (text/plain), 5.64 KB, created by
MJ Ray (software.coop)
on 2011-09-22 20:22:46 UTC
(
hide
)
Description:
Bug 6460: alternative fix, updating template and script instead of C4::Log - a bit rushed
Filename:
MIME Type:
Creator:
MJ Ray (software.coop)
Created:
2011-09-22 20:22:46 UTC
Size:
5.64 KB
patch
obsolete
>From ff9eb7f41c4236d6439fdaad9471ca31021f305e Mon Sep 17 00:00:00 2001 >From: MJ Ray <mjr@phonecoop.coop> >Date: Thu, 22 Sep 2011 19:27:43 +0100 >Subject: [PATCH] Bug 6460: alternative fix, updating template and script instead of C4::Log - a bit rushed > >--- > .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 85 +------------------ > tools/viewlog.pl | 6 +- > 2 files changed, 10 insertions(+), 81 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >index c109744..f20569d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >@@ -59,11 +59,11 @@ > <label for="action">Action:</label> > <select name="action" id="action"> > <option value ="">All</option> >- <option value ="add">Add</option> >- <option value ="del">Delete</option> >- <option value ="mod">Modify</option> >- <option value="issue">Checkout</option> >- <option value="return">Return</option> >+ <option value ="ADD">Add</option> >+ <option value ="DELETE">Delete</option> >+ <option value ="MODIFY">Modify</option> >+ <option value="ISSUE">Checkout</option> >+ <option value="RETURN">Return</option> > </select> > </li> > <li> >@@ -133,81 +133,6 @@ > <input type="submit" value="Submit" /> > <input type="hidden" name="do_it" value="1" /> > </fieldset> >- [% IF ( do_it ) %] >- [% IF ( total ) %] >- <h4>[% total %] lines found.</h4> >- <table> >- <tr> >- <th>Date</th> >- <th>Librarian</th> >- <th>Module</th> >- <th>Action</th> >- <th>Object</th> >- <th>Info</th> >- </tr> >- [% 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."> [% loopro.user %] </a> >- </td> >- <td>[% loopro.module %]</td> >- <td>[% loopro.action %]</td> >- <td> >- [% IF ( module == 'MEMBERS' ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> member [% loopro.object %] </a> >- [% ELSE %] >- [% IF ( module == 'CIRCULATION' ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> >- [% IF ( loopro.object ) %] >- member [% loopro.object %] >- [% END %] >- </a> >- [% ELSE %] >- [% IF ( module == 'CATALOGUING' ) %] >- [% IF ( info == '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> >- [% ELSE %] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.object %]" title="Display detail for this biblio">biblio [% loopro.object %]</a> >- [% END %] >- [% ELSE %] >- [% IF ( module == 'SERIAL' ) %] >- <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% loopro.object %]"> [% loopro.object %] </a> >- [% ELSE %] >- [% IF ( module == 'AUTHORITIES' ) %] >- <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% loopro.object %]" title="Display detail for this authority">auth [% loopro.object %]</a> >- [% ELSE %] >- [% loopro.object %] >- [% END %] >- [% END %] >- [% END %] >- [% END %] >- [% END %] >- </td> >- <td> >- [% IF ( loopro.CIRCULATION ) %] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.info %]" title="Display detail for this biblio">biblio [% loopro.info |html %]</a> >- [% ELSE %] >- [% loopro.info |html %] >- [% END %] >- </td> >- </tr> >- [% END %] >- </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 %]">[% firstname %] [% surname %] ([% cardnumber %])</a> >- [% END %] >- . >- </div> >- [% END %] >- [% END %] >- > </form> > [% END %] > [% IF ( do_it ) %] >diff --git a/tools/viewlog.pl b/tools/viewlog.pl >index d689217..5c43098 100755 >--- a/tools/viewlog.pl >+++ b/tools/viewlog.pl >@@ -1,6 +1,7 @@ > #!/usr/bin/perl > > # Copyright 2010 BibLibre >+# Copyright 2011 MJ Ray and software.coop > # > # This file is part of Koha. > # >@@ -105,7 +106,10 @@ $template->param( > if ($do_it) { > > my @data; >- my $results = GetLogs($datefrom,$dateto,$user,\@modules,\@action,$object,$info); >+ my ($results,$modules,$action); >+ if ($action[0] ne '') { $action = \@action; } # match All means no limit >+ if ($modules[0] ne '') { $modules = \@modules; } # match All means no limit >+ $results = GetLogs($datefrom,$dateto,$user,$modules,$action,$object,$info); > @data=@$results; > my $total = scalar @data; > foreach my $result (@data){ >-- >1.7.2.5
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 6460
:
4359
|
4478
|
5546
|
5560
|
5569
|
5570