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

(-)a/Koha/Old/Biblio.pm (+5 lines)
Lines 19-24 use Modern::Perl; Link Here
19
19
20
use base qw(Koha::Object);
20
use base qw(Koha::Object);
21
21
22
use C4::Context;
23
use C4::Log qw( logaction );
22
use Koha::Database;
24
use Koha::Database;
23
use Koha::Biblio;
25
use Koha::Biblio;
24
use Koha::Biblioitem;
26
use Koha::Biblioitem;
Lines 188-193 sub restore { Link Here
188
    my $indexer = Koha::SearchEngine::Indexer->new( { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
190
    my $indexer = Koha::SearchEngine::Indexer->new( { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
189
    $indexer->index_records( $new_biblio->biblionumber, "specialUpdate", "biblioserver" );
191
    $indexer->index_records( $new_biblio->biblionumber, "specialUpdate", "biblioserver" );
190
192
193
    logaction( "CATALOGUING", "RESTORE", $new_biblio->biblionumber, "biblio", undef, $new_biblio )
194
        if C4::Context->preference("CataloguingLog");
195
191
    return $new_biblio;
196
    return $new_biblio;
192
}
197
}
193
198
(-)a/Koha/Old/Item.pm (+5 lines)
Lines 19-24 use Modern::Perl; Link Here
19
19
20
use base qw(Koha::Object);
20
use base qw(Koha::Object);
21
21
22
use C4::Context;
23
use C4::Log qw( logaction );
22
use Koha::Biblio;
24
use Koha::Biblio;
23
use Koha::Biblios;
25
use Koha::Biblios;
24
use Koha::Exceptions;
26
use Koha::Exceptions;
Lines 86-91 sub restore { Link Here
86
    my $indexer = Koha::SearchEngine::Indexer->new( { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
88
    my $indexer = Koha::SearchEngine::Indexer->new( { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
87
    $indexer->index_records( $new_item->biblionumber, "specialUpdate", "biblioserver" );
89
    $indexer->index_records( $new_item->biblionumber, "specialUpdate", "biblioserver" );
88
90
91
    logaction( "CATALOGUING", "RESTORE", $new_item->itemnumber, "item", undef, $new_item )
92
        if C4::Context->preference("CataloguingLog");
93
89
    return $new_item;
94
    return $new_item;
90
}
95
}
91
96
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc (+2 lines)
Lines 55-60 Link Here
55
        <span>Delete</span>
55
        <span>Delete</span>
56
    [% CASE 'MODIFY' %]
56
    [% CASE 'MODIFY' %]
57
        <span>Modify</span>
57
        <span>Modify</span>
58
    [% CASE 'RESTORE' %]
59
        <span>Restore</span>
58
    [% CASE 'ISSUE' %]
60
    [% CASE 'ISSUE' %]
59
        <span>Checkout</span>
61
        <span>Checkout</span>
60
    [% CASE 'RETURN' %]
62
    [% CASE 'RETURN' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc (-1 / +1 lines)
Lines 81-87 Link Here
81
81
82
        [%- IF ( CAN_user_tools_view_system_logs ) -%]
82
        [%- IF ( CAN_user_tools_view_system_logs ) -%]
83
            <li [% IF logview %]class="active"[% END %]>
83
            <li [% IF logview %]class="active"[% END %]>
84
                <a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=CATALOGUING&amp;action=MODIFY&amp;object=[% biblio_object_id | url %]&amp;object_type=biblio">Modification log</a>
84
                <a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=CATALOGUING&amp;actions=MODIFY&amp;actions=RESTORE&amp;object=[% biblio_object_id | url %]&amp;object_type=biblio">Modification log</a>
85
            </li>
85
            </li>
86
        [%- END -%]
86
        [%- END -%]
87
87
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-2 / +1 lines)
Lines 147-153 Link Here
147
                            <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value="" /> All</label>
147
                            <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value="" /> All</label>
148
                        [% END %]
148
                        [% END %]
149
149
150
                        [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'FILL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'MODCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'RESET PASS' 'Run' 'End' 'PATRON_MERGE' 'EDIT_MAPPINGS' 'RESET_MAPPINGS' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' 'ACQUISITION CLAIM' 'ACQUISITION ORDER' 'OVERDUE' 'EXPIRE' 'CREATE_RESTRICTION' 'MODIFY_RESTRICTION' 'DELETE_RESTRICTION' 'MODIFY_CARDNUMBER' 'RESET 2FA' ] %]
150
                        [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'RESTORE' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'FILL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'MODCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'RESET PASS' 'Run' 'End' 'PATRON_MERGE' 'EDIT_MAPPINGS' 'RESET_MAPPINGS' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' 'ACQUISITION CLAIM' 'ACQUISITION ORDER' 'OVERDUE' 'EXPIRE' 'CREATE_RESTRICTION' 'MODIFY_RESTRICTION' 'DELETE_RESTRICTION' 'MODIFY_CARDNUMBER' 'RESET 2FA' ] %]
151
                            [% IF actions.grep(actx).size %]
151
                            [% IF actions.grep(actx).size %]
152
                                <label for="action[% actx| replace('\s+', '_') | html %]" class="viewlog"
152
                                <label for="action[% actx| replace('\s+', '_') | html %]" class="viewlog"
153
                                    ><input type="checkbox" id="action[% actx | replace('\s+', '_') | html %]" name="actions" value="[% actx | html %]" checked="checked" /> [% PROCESS translate_log_action action=actx %]</label
153
                                    ><input type="checkbox" id="action[% actx | replace('\s+', '_') | html %]" name="actions" value="[% actx | html %]" checked="checked" /> [% PROCESS translate_log_action action=actx %]</label
154
- 

Return to bug 17387