Attachment #118134 for bug #14233

View | Details | Raw Unified | Return to bug 14233
Collapse All | Expand All





[%        CASE 'SEARCHENGINE' %]Search engine

[%        CASE 'NOTICES'      %]Notices
[%        CASE %][% module | html %]
[%    END %]
[% END %]

[%        CASE 'COMMANDLINE' %]Command-line
[%        CASE 'API'         %]REST API
[%        CASE 'CRON'        %]Cron job
[%        CASE 'UPGRADE'     %]Upgrade
[%        CASE %][% log_interface | html %]
[%    END %]
[% END %]

                                        [% ELSE %]
                                            <label for="moduleALL" class="viewlog"><input type="checkbox" id="moduleALL" name="modules" value=""> All</label>
                                        [% END %]
                                        [% FOREACH modx IN [ 'AUTH' 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS', 'SEARCHENGINE', 'NOTICES' ] %]
                                            [% IF modules.grep(modx).size %]
                                                <label for="module[% modx | html %]" class="viewlog"><input type="checkbox" id="module[% modx | html %]" name="modules" value="[% modx | html %]" checked="checked"> [% PROCESS translate_log_module module=modx %]</label>
                                            [% ELSE %]

                                            [% ELSE %]
                                                [% loopro.object | html %]
                                            [% END %]
                                        [% ELSIF ( loopro.module == 'CATALOGUING' ) %]
                                            [% IF ( loopro.info.substr(0, 4) == 'item' ) %]
                                                <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.object | uri %]&amp;biblionumber=[% loopro.biblionumber | uri %]&amp;bi=[% loopro.biblioitemnumber | uri %]#item[% loopro.object | uri %]">Item [% loopro.object | html %]</a> from
                                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.biblionumber | uri %]" title="Display detail for this biblio">Biblio [% loopro.biblionumber | html %]</a>
                                            [% ELSIF ( loopro.info.substr(0, 6) == 'biblio' ) %]
                                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.object | uri %]" title="Display detail for this biblio">Biblio [% loopro.object | html %]</a>
                                            [% ELSE %]
                                                [% loopro.object | html %]
                                            [% END %]
                                        [% ELSIF ( loopro.module == 'SERIAL' ) %]
                                            <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% loopro.object | uri %]">Subscription [% loopro.object | html %] </a>
                                        [% ELSIF ( loopro.module == 'AUTHORITIES' ) %]
                                            <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% loopro.object | uri %]" title="Display detail for this authority">Authority [% loopro.object | html %]</a>
                                        [% ELSIF ( loopro.module == 'NOTICES' ) %]
                                            [% IF ( loopro.notice ) %]
                                                <a href="/cgi-bin/koha/tools/letter.pl??op=add_form&branchcode=[% loopro.notice.branchcode | uri %]&module=[% loopro.notice.module | uri %]&code=[% loopro.notice.code | uri %]&lang=[% loopro.notice.lang %]">Notice [% loopro.notice.title | html %]</a>
                                            [% ELSE %]
                                                [% loopro.object | html %]
                                            [% END %]
                                        [% ELSE %]
                                            [% loopro.object | html %]
                                                    [% IF ( loopro.info.substr(0, 4) == 'item' ) %]
                                                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.object | uri %]&amp;biblionumber=[% loopro.biblionumber | uri %]&amp;bi=[% loopro.biblioitemnumber | uri %]#item[% loopro.object | uri %]">Item [% loopro.object | html %]</a> from
                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.biblionumber | uri %]" title="Display detail for this biblio">Biblio [% loopro.biblionumber | html %]</a>
                                                    [% ELSIF ( loopro.info.substr(0, 6) == 'biblio' ) %]
                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.object | uri %]" title="Display detail for this biblio">Biblio [% loopro.object | html %]</a>
                                                    [% ELSE %]
                                                        [% loopro.object | html %]
                                                    [% END %]
                                                [% ELSE %]
                                                    [% IF ( loopro.module == 'SERIAL' ) %]
                                                        <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% loopro.object | uri %]">Subscription [% loopro.object | html %] </a>
                                                    [% ELSE %]
                                                        [% IF ( loopro.module == 'AUTHORITIES' ) %]
                                                            <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% loopro.object | uri %]" title="Display detail for this authority">Authority [% loopro.object | html %]</a>
                                                        [% ELSE %]
                                                            [% loopro.object | html %]
                                                        [% END %]
                                                    [% END %]
                                                [% END %]
                                        [% END %]
                                    </td>
                                    <td>




                }
            }
        }

        if ( $log->module eq 'NOTICES' ) {
            if ( $log->object ) {
                my $notice = Koha::Notice::Templates->find( { id => $log->object } );
                if ($notice && $output eq 'screen') {
                    $result->{notice} = $notice->unblessed;
                }
            }
        }

        push @data, $result;
    }
    if ( $output eq "screen" ) {
- 

Return to bug 14233

Lines 96-101 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-21 / +23 lines)
96		96
97	[% CASE 'SEARCHENGINE' %]Search engine	97	[% CASE 'SEARCHENGINE' %]Search engine
98		98
		99	[% CASE 'NOTICES' %]Notices
99	[% CASE %][% module \| html %]	100	[% CASE %][% module \| html %]
100	[% END %]	101	[% END %]
101	[% END %]	102	[% END %]
Lines 133-138 Link Here
133	[% CASE 'COMMANDLINE' %]Command-line	134	[% CASE 'COMMANDLINE' %]Command-line
134	[% CASE 'API' %]REST API	135	[% CASE 'API' %]REST API
135	[% CASE 'CRON' %]Cron job	136	[% CASE 'CRON' %]Cron job
		137	[% CASE 'UPGRADE' %]Upgrade
136	[% CASE %][% log_interface \| html %]	138	[% CASE %][% log_interface \| html %]
137	[% END %]	139	[% END %]
138	[% END %]	140	[% END %]
Lines 172-178 Link Here
172	[% ELSE %]	174	[% ELSE %]
173	<label for="moduleALL" class="viewlog"><input type="checkbox" id="moduleALL" name="modules" value=""> All</label>	175	<label for="moduleALL" class="viewlog"><input type="checkbox" id="moduleALL" name="modules" value=""> All</label>
174	[% END %]	176	[% END %]
175	[% FOREACH modx IN [ 'AUTH' 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS', 'SEARCHENGINE' ] %]	177	[% FOREACH modx IN [ 'AUTH' 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS', 'SEARCHENGINE', 'NOTICES' ] %]
176	[% IF modules.grep(modx).size %]	178	[% IF modules.grep(modx).size %]
177	<label for="module[% modx \| html %]" class="viewlog"><input type="checkbox" id="module[% modx \| html %]" name="modules" value="[% modx \| html %]" checked="checked"> [% PROCESS translate_log_module module=modx %]</label>	179	<label for="module[% modx \| html %]" class="viewlog"><input type="checkbox" id="module[% modx \| html %]" name="modules" value="[% modx \| html %]" checked="checked"> [% PROCESS translate_log_module module=modx %]</label>
178	[% ELSE %]	180	[% ELSE %]
Lines 306-332 Link Here
306	[% ELSE %]	308	[% ELSE %]
307	[% loopro.object \| html %]	309	[% loopro.object \| html %]
308	[% END %]	310	[% END %]
		311	[% ELSIF ( loopro.module == 'CATALOGUING' ) %]
		312	[% IF ( loopro.info.substr(0, 4) == 'item' ) %]
		313	<a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.object \| uri %]&biblionumber=[% loopro.biblionumber \| uri %]&bi=[% loopro.biblioitemnumber \| uri %]#item[% loopro.object \| uri %]">Item [% loopro.object \| html %]</a> from
		314	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.biblionumber \| uri %]" title="Display detail for this biblio">Biblio [% loopro.biblionumber \| html %]</a>
		315	[% ELSIF ( loopro.info.substr(0, 6) == 'biblio' ) %]
		316	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.object \| uri %]" title="Display detail for this biblio">Biblio [% loopro.object \| html %]</a>
		317	[% ELSE %]
		318	[% loopro.object \| html %]
		319	[% END %]
		320	[% ELSIF ( loopro.module == 'SERIAL' ) %]
		321	<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% loopro.object \| uri %]">Subscription [% loopro.object \| html %] </a>
		322	[% ELSIF ( loopro.module == 'AUTHORITIES' ) %]
		323	<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% loopro.object \| uri %]" title="Display detail for this authority">Authority [% loopro.object \| html %]</a>
		324	[% ELSIF ( loopro.module == 'NOTICES' ) %]
		325	[% IF ( loopro.notice ) %]
		326	<a href="/cgi-bin/koha/tools/letter.pl??op=add_form&branchcode=[% loopro.notice.branchcode \| uri %]&module=[% loopro.notice.module \| uri %]&code=[% loopro.notice.code \| uri %]&lang=[% loopro.notice.lang %]">Notice [% loopro.notice.title \| html %]</a>
		327	[% ELSE %]
		328	[% loopro.object \| html %]
		329	[% END %]
309	[% ELSE %]	330	[% ELSE %]
310	[% IF ( loopro.module == 'CATALOGUING' ) %]	331	[% loopro.object \| html %]
311	[% IF ( loopro.info.substr(0, 4) == 'item' ) %]
312	<a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.object \| uri %]&biblionumber=[% loopro.biblionumber \| uri %]&bi=[% loopro.biblioitemnumber \| uri %]#item[% loopro.object \| uri %]">Item [% loopro.object \| html %]</a> from
313	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.biblionumber \| uri %]" title="Display detail for this biblio">Biblio [% loopro.biblionumber \| html %]</a>
314	[% ELSIF ( loopro.info.substr(0, 6) == 'biblio' ) %]
315	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.object \| uri %]" title="Display detail for this biblio">Biblio [% loopro.object \| html %]</a>
316	[% ELSE %]
317	[% loopro.object \| html %]
318	[% END %]
319	[% ELSE %]
320	[% IF ( loopro.module == 'SERIAL' ) %]
321	<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% loopro.object \| uri %]">Subscription [% loopro.object \| html %] </a>
322	[% ELSE %]
323	[% IF ( loopro.module == 'AUTHORITIES' ) %]
324	<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% loopro.object \| uri %]" title="Display detail for this authority">Authority [% loopro.object \| html %]</a>
325	[% ELSE %]
326	[% loopro.object \| html %]
327	[% END %]
328	[% END %]
329	[% END %]
330	[% END %]	332	[% END %]
331	</td>	333	</td>
332	<td>	334	<td>

Lines 186-191 if ($do_it) { Link Here

(-)a/tools/viewlog.pl (-1 / +10 lines)
186	}	186	}
187	}	187	}
188	}	188	}
		189
		190	if ( $log->module eq 'NOTICES' ) {
		191	if ( $log->object ) {
		192	my $notice = Koha::Notice::Templates->find( { id => $log->object } );
		193	if ($notice && $output eq 'screen') {
		194	$result->{notice} = $notice->unblessed;
		195	}
		196	}
		197	}
		198
189	push @data, $result;	199	push @data, $result;
190	}	200	}
191	if ( $output eq "screen" ) {	201	if ( $output eq "screen" ) {
192	-