Attachment #102067 for bug #14367

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

Lines 302-308 sub ModBiblio { Link Here

(-)a/C4/Biblio.pm (-1 / +1 lines)
302	# update biblionumber and biblioitemnumber in MARC	302	# update biblionumber and biblioitemnumber in MARC
303	# FIXME - this is assuming a 1 to 1 relationship between	303	# FIXME - this is assuming a 1 to 1 relationship between
304	# biblios and biblioitems	304	# biblios and biblioitems
305	my $sth = $dbh->prepare("select biblioitems.biblioitemnumber, biblio_metadata.history from biblioitems, biblio_metadata where biblioitems.biblionumber=?");	305	my $sth = $dbh->prepare("select biblioitems.biblioitemnumber, biblio_metadata.history from biblioitems INNER JOIN biblio_metadata ON biblioitems.biblionumber = biblio_metadata.biblionumber WHERE biblioitems.biblionumber=?");
306	$sth->execute($biblionumber);	306	$sth->execute($biblionumber);
307	my ($biblioitemnumber, $history) = $sth->fetchrow;	307	my ($biblioitemnumber, $history) = $sth->fetchrow;
308	$sth->finish();	308	$sth->finish();

Lines 857-863 if ( $op eq "addbiblio" ) { Link Here

(-)a/cataloguing/addbiblio.pl (-1 / +1 lines)
857	else {	857	else {
858	( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );	858	( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );
859	}	859	}
860	if ($redirect eq "items" \|\| ($mode ne "popup" && !$is_a_modif && $redirect ne "view" && $redirect ne "just_save")){	860	if ($redirect eq "items" \|\| (defined $mode && $mode ne "popup" && !$is_a_modif && $redirect ne "view" && $redirect ne "just_save")){
861	if ($frameworkcode eq 'FA'){	861	if ($frameworkcode eq 'FA'){
862	print $input->redirect(	862	print $input->redirect(
863	'/cgi-bin/koha/cataloguing/additem.pl?'	863	'/cgi-bin/koha/cataloguing/additem.pl?'




[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Cataloging &rsaquo; [% IF ( biblionumber ) %]Editing [% title | html %] (Record number [% biblionumber | html %])[% ELSE %]Add MARC record[% END %]</title>
[% INCLUDE 'doc-head-close.inc' %]

    var Sticky;
    $(document).ready(function() {

        $(".input_marceditor").click(function(){
            var tag = $(this).attr('id');
            historyToggle(tag + '_history');
            return false;
        });

        $(".tag_editor").click(function(){
            var tag = $(this).attr('id');
            openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id, tag, 'biblio');
            return false;
        });

        $(".buttonHistory").click(function(){
            var tag = $(this).attr('id');
            HistoryToggle(tag + '_history');
            return false;
        });

        $(".hist_rollback").click(function(){
            var tag = $(this).attr('data-tag');
            var value = $(this).attr('data-history');
            HistoryRollback(tag, value);
            return false;
        });



                                                [% IF ( subfield_loo.history ) %]
                                                <span class="subfield_history">
                                                    <a href="#" class="buttonHistory" id="[%- mv.id -%]">
                                                        <img src="[% interface %]/[% theme %]/img/icon-history.png" alt="History" title="Display history for this field" />
                                                    </a>
                                                </span>

                                                    <tr>
                                                        <th>Value</th>
                                                        <th>Date</th>
                                                        <th>User</th>
                                                    </tr>
                                                    [% FOREACH hist IN subfield_loo.history %]
                                                    <tr>
                                                        <td><a href="#" data-tag='[%- mv.id -%]' data-history='[% hist.data %]' class='hist_rollback'>[% hist.data %]</a></td>
                                                        <td>[% hist.datetime | $KohaDates with_hours = 1 %]</td>
                                                        <td>[% hist.title | html %] [% hist.firstname | html %] [% hist.surname | html %]</td>
                                                    </tr>
                                                    [% END %]
                                                </table>
- 

Return to bug 14367

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (-9 / +25 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
		4	[% USE KohaDates %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Koha &rsaquo; Cataloging &rsaquo; [% IF ( biblionumber ) %]Editing [% title \| html %] (Record number [% biblionumber \| html %])[% ELSE %]Add MARC record[% END %]</title>	6	<title>Koha &rsaquo; Cataloging &rsaquo; [% IF ( biblionumber ) %]Editing [% title \| html %] (Record number [% biblionumber \| html %])[% ELSE %]Add MARC record[% END %]</title>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
Lines 18-30 Link Here
18	var Sticky;	19	var Sticky;
19	$(document).ready(function() {	20	$(document).ready(function() {
20		21
21	$(".input_marceditor").click(function(this){	22	$(".input_marceditor").click(function(){
22	historyToggle($(this).attr('id') + '_history');	23	var tag = $(this).attr('id');
		24	historyToggle(tag + '_history');
23	return false;	25	return false;
24	});	26	});
25		27
26	$(".tag_editor").click(function(this){	28	$(".tag_editor").click(function(){
27	openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id, $(this).attr('id'), 'biblio');	29	var tag = $(this).attr('id');
		30	openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id, tag, 'biblio');
		31	return false;
		32	});
		33
		34	$(".buttonHistory").click(function(){
		35	var tag = $(this).attr('id');
		36	HistoryToggle(tag + '_history');
		37	return false;
		38	});
		39
		40	$(".hist_rollback").click(function(){
		41	var tag = $(this).attr('data-tag');
		42	var value = $(this).attr('data-history');
		43	HistoryRollback(tag, value);
28	return false;	44	return false;
29	});	45	});
30		46
Lines 887-893 Link Here
887		903
888	[% IF ( subfield_loo.history ) %]	904	[% IF ( subfield_loo.history ) %]
889	<span class="subfield_history">	905	<span class="subfield_history">
890	<a href="#" class="buttonHistory" onclick="HistoryToggle('[% mv.id %]_history'); return false;">	906	<a href="#" class="buttonHistory" id="[%- mv.id -%]">
891	<img src="[% interface %]/[% theme %]/img/icon-history.png" alt="History" title="Display history for this field" />	907	<img src="[% interface %]/[% theme %]/img/icon-history.png" alt="History" title="Display history for this field" />
892	</a>	908	</a>
893	</span>	909	</span>
Lines 896-907 Link Here
896	<tr>	912	<tr>
897	<th>Value</th>	913	<th>Value</th>
898	<th>Date</th>	914	<th>Date</th>
		915	<th>User</th>
899	</tr>	916	</tr>
900	[% FOREACH hist IN subfield_loo.history %]	917	[% FOREACH hist IN subfield_loo.history %]
901	<tr>	918	<tr>
902	<td><a href="#" onclick="HistoryRollback('[% mv.id %]', '[% hist.data %]'); return false;">[% hist.data %]</a></td>	919	<td><a href="#" data-tag='[%- mv.id -%]' data-history='[% hist.data %]' class='hist_rollback'>[% hist.data %]</a></td>
903	<td>[% hist.datetime %]</td>	920	<td>[% hist.datetime \| $KohaDates with_hours = 1 %]</td>
904	<td>[% hist.title %] [% hist.firstname %] [% hist.surname %]</td>	921	<td>[% hist.title \| html %] [% hist.firstname \| html %] [% hist.surname \| html %]</td>
905	</tr>	922	</tr>
906	[% END %]	923	[% END %]
907	</table>	924	</table>
908	-