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

(-)a/Koha/ERM/EUsage/CounterFile.pm (-1 / +4 lines)
Lines 35-40 use Koha::ERM::EUsage::UsageDataProvider; Link Here
35
use Koha::ERM::EUsage::SushiCounter;
35
use Koha::ERM::EUsage::SushiCounter;
36
use Koha::Exceptions::ERM::EUsage::CounterFile;
36
use Koha::Exceptions::ERM::EUsage::CounterFile;
37
37
38
use C4::Context;
39
38
use base qw(Koha::Object);
40
use base qw(Koha::Object);
39
41
40
use Koha::ERM::EUsage::CounterLogs;
42
use Koha::ERM::EUsage::CounterLogs;
Lines 558-567 Adds a erm_counter_logs database entry Link Here
558
sub _add_counter_log_entry {
560
sub _add_counter_log_entry {
559
    my ($self) = @_;
561
    my ($self) = @_;
560
562
563
    my $user = C4::Context->userenv()->{'number'};
561
    Koha::ERM::EUsage::CounterLog->new(
564
    Koha::ERM::EUsage::CounterLog->new(
562
        {
565
        {
563
            #TODO: borrowernumber only required for manual uploads or "harvest now" button clicks
566
            #TODO: borrowernumber only required for manual uploads or "harvest now" button clicks
564
            borrowernumber   => undef,
567
            borrowernumber   => $user,
565
            counter_files_id => $self->erm_counter_files_id,
568
            counter_files_id => $self->erm_counter_files_id,
566
            importdate       => $self->date_uploaded,
569
            importdate       => $self->date_uploaded,
567
            filename         => $self->filename,
570
            filename         => $self->filename,
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersCounterLogs.vue (-3 / +6 lines)
Lines 40-46 export default { Link Here
40
            building_table: false,
40
            building_table: false,
41
            tableOptions: {
41
            tableOptions: {
42
                columns: this.getTableColumns(),
42
                columns: this.getTableColumns(),
43
                options: {},
43
                options: {
44
                    embed: "borrowernumber",
45
                },
44
                url: () => this.table_url(),
46
                url: () => this.table_url(),
45
                table_settings: this.counter_log_table_settings,
47
                table_settings: this.counter_log_table_settings,
46
                add_filters: true,
48
                add_filters: true,
Lines 137-144 export default { Link Here
137
                {
139
                {
138
                    title: __("Imported by"),
140
                    title: __("Imported by"),
139
                    render: function (data, type, row, meta) {
141
                    render: function (data, type, row, meta) {
140
                        const importer = row.borrowernumber
142
                        const borrower = row.borrowernumber
141
                            ? `<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=${row.borrowernumber}">Borrowernumber ${row.borrowernumber}</a>`
143
                        const importer = borrower
144
                            ? `<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=${borrower.patron_id}">${borrower.firstname} ${borrower.surname}</a>`
142
                            : "Cronjob"
145
                            : "Cronjob"
143
                        return importer
146
                        return importer
144
                    },
147
                    },
(-)a/misc/cronjobs/erm_run_harvester.pl (-2 / +1 lines)
Lines 22-28 use Getopt::Long qw( GetOptions ); Link Here
22
use Koha::DateUtils qw( dt_from_string );
22
use Koha::DateUtils qw( dt_from_string );
23
use POSIX;
23
use POSIX;
24
24
25
use Koha::Script;
25
use Koha::Script -cron;
26
use Koha::ERM::EUsage::UsageDataProviders;
26
use Koha::ERM::EUsage::UsageDataProviders;
27
27
28
# Command line option values
28
# Command line option values
29
- 

Return to bug 36627