Attachment #23919 for bug #11477

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




                                <tr>
                                    <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 %] [% END %][% loopro.user %] </a>
                                    </td>
                                    <td>[% loopro.module %]</td>
                                    <td>[% 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 %] [% ELSE %]Member [% END %][% loopro.object %][% END %] </a>
                                        [% ELSE %]
                                                [% IF ( loopro.module == 'CATALOGUING' ) %]
                                                    [% IF ( loopro.info.substr(0, 4) == 'item' ) %]




	    $result->{'biblioitemnumber'}=$item->{'biblionumber'};		
        $result->{'barcode'}=$item->{'barcode'};
	}
    #always add firstname and surname for librarian/user
    if ($result->{'user'}){
        my $userdetails = C4::Members::GetMemberDetails($result->{'user'});
        if ($userdetails->{'firstname'}){
            $result->{'userfirstname'} = $userdetails->{'firstname'};
        }
        if ($userdetails->{'surname'}){
            $result->{'usersurname'} = $userdetails->{'surname'};
        }
    }
    #add firstname and surname for borrower, when using the CIRCULATION, MEMBERS, FINES
    if ($result->{module} eq "CIRCULATION" || $result->{module} eq "MEMBERS" || $result->{module} eq "FINES"){
        if($result->{'object'}){
            my $borrowerdetails = C4::Members::GetMemberDetails($result->{'object'});
            if ($borrowerdetails->{'firstname'}){
            $result->{'borrowerfirstname'} = $borrowerdetails->{'firstname'};
            }
            if ($borrowerdetails->{'surname'}){
                $result->{'borrowersurname'} = $borrowerdetails->{'surname'};
            }
        }
    }
    }
    
    if ( $output eq "screen" ) {
- 

Return to bug 11477

Lines 127-139 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-2 / +2 lines)
127	<tr>	127	<tr>
128	<td>[% loopro.timestamp %]</td>	128	<td>[% loopro.timestamp %]</td>
129	<td>	129	<td>
130	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.user %]" title="display detail for this librarian."> [% loopro.user %] </a>	130	<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 %] [% END %][% loopro.user %] </a>
131	</td>	131	</td>
132	<td>[% loopro.module %]</td>	132	<td>[% loopro.module %]</td>
133	<td>[% loopro.action %]</td>	133	<td>[% loopro.action %]</td>
134	<td>	134	<td>
135	[% IF ( loopro.module == 'MEMBERS' ) \|\| ( loopro.module == 'CIRCULATION' ) \|\| ( loopro.module == 'FINES' ) %]	135	[% IF ( loopro.module == 'MEMBERS' ) \|\| ( loopro.module == 'CIRCULATION' ) \|\| ( loopro.module == 'FINES' ) %]
136	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> [% IF ( loopro.object ) %]Member [% loopro.object %][% END %] </a>	136	<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 %] [% ELSE %]Member [% END %][% loopro.object %][% END %] </a>
137	[% ELSE %]	137	[% ELSE %]
138	[% IF ( loopro.module == 'CATALOGUING' ) %]	138	[% IF ( loopro.module == 'CATALOGUING' ) %]
139	[% IF ( loopro.info.substr(0, 4) == 'item' ) %]	139	[% IF ( loopro.info.substr(0, 4) == 'item' ) %]

Lines 124-129 if ($do_it) { Link Here

(-)a/tools/viewlog.pl (-1 / +22 lines)
124	$result->{'biblioitemnumber'}=$item->{'biblionumber'};	124	$result->{'biblioitemnumber'}=$item->{'biblionumber'};
125	$result->{'barcode'}=$item->{'barcode'};	125	$result->{'barcode'}=$item->{'barcode'};
126	}	126	}
		127	#always add firstname and surname for librarian/user
		128	if ($result->{'user'}){
		129	my $userdetails = C4::Members::GetMemberDetails($result->{'user'});
		130	if ($userdetails->{'firstname'}){
		131	$result->{'userfirstname'} = $userdetails->{'firstname'};
		132	}
		133	if ($userdetails->{'surname'}){
		134	$result->{'usersurname'} = $userdetails->{'surname'};
		135	}
		136	}
		137	#add firstname and surname for borrower, when using the CIRCULATION, MEMBERS, FINES
		138	if ($result->{module} eq "CIRCULATION" \|\| $result->{module} eq "MEMBERS" \|\| $result->{module} eq "FINES"){
		139	if($result->{'object'}){
		140	my $borrowerdetails = C4::Members::GetMemberDetails($result->{'object'});
		141	if ($borrowerdetails->{'firstname'}){
		142	$result->{'borrowerfirstname'} = $borrowerdetails->{'firstname'};
		143	}
		144	if ($borrowerdetails->{'surname'}){
		145	$result->{'borrowersurname'} = $borrowerdetails->{'surname'};
		146	}
		147	}
		148	}
127	}	149	}
128		150
129	if ( $output eq "screen" ) {	151	if ( $output eq "screen" ) {
130	-