Bugzilla – Attachment 126783 Details for
Bug 14957
Write protecting MARC fields based on source of import
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14957: Fix record preview
Bug-14957-Fix-record-preview.patch (text/plain), 6.11 KB, created by
Martin Renvoize (ashimema)
on 2021-10-22 12:39:57 UTC
(
hide
)
Description:
Bug 14957: Fix record preview
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2021-10-22 12:39:57 UTC
Size:
6.11 KB
patch
obsolete
>From 69bae512f72bf8c9bce2b3b86453978adc4cf455 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 18 Oct 2021 13:04:55 +0200 >Subject: [PATCH] Bug 14957: Fix record preview > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../tools/batch_record_modification.tt | 6 ++-- > svc/records/preview | 32 ++++++++++++++++--- > 2 files changed, 30 insertions(+), 8 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >index 9cde52931f..a88f84c6b2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >@@ -198,7 +198,7 @@ > <td>[% biblio.biblionumber | html %]</td> > <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.title | html %]</a></td> > <td class="actions"> >- <a href="/cgi-bin/koha/svc/records/preview?record_type=biblio&record_id=[% biblio.biblionumber | uri %]&mmtid=[% mmtid | uri %]" class="previewMARC btn btn-default btn-xs" data-record_type="biblio" data-record_id="[% biblio.biblionumber | html %]" data-mmtid="[% mmtid | html %]" title="Preview MARC"><i class="fa fa-eye"></i> Show MARC</a> >+ <a href="/cgi-bin/koha/svc/records/preview?record_type=biblio&record_id=[% biblio.biblionumber | uri %]&mmtid=[% mmtid | uri %]&overlay_context=batchmod" class="previewMARC btn btn-default btn-xs" data-record_type="biblio" data-record_id="[% biblio.biblionumber | html %]" data-mmtid="[% mmtid | html %]" title="Preview MARC"><i class="fa fa-eye"></i> Show MARC</a> > </td> > </tr> > [% END %] >@@ -225,7 +225,7 @@ > <td><input type="checkbox" name="record_id" value="[% authority.authid | html %]" data-usage="[% authority.count_usage | html %]" /></td> > <td><a href="/cgi-bin/koha/authorities/detail.pl?authid=[% authority.authid | uri %]">[% authority.authid | html %]</a></td> > <td>[% PROCESS authresult summary=authority.summary authid=authority.authid %]</td> >- <td class="actions"><a href="/cgi-bin/koha/svc/records/preview?record_type=authority&record_id=[% authority.authid | uri %]&mmtid=[% mmtid | uri %]" data-record_type="authority" data-record_id="[% authority.authid | html %]" data-mmtid="[% mmtid | html %]" class="previewMARC btn btn-default btn-xs"><i class='fa fa-eye'></i> Show MARC</a> >+ <td class="actions"><a href="/cgi-bin/koha/svc/records/preview?record_type=authority&record_id=[% authority.authid | uri %]&mmtid=[% mmtid | uri %]&overlay_context=batchmod" data-record_type="authority" data-record_id="[% authority.authid | html %]" data-mmtid="[% mmtid | html %]" class="previewMARC btn btn-default btn-xs"><i class='fa fa-eye'></i> Show MARC</a> > </tr> > [% END %] > </tbody> >@@ -355,7 +355,7 @@ > var url = "/cgi-bin/koha/svc/records/preview?" > var mmtid = $(this).val(); > $("a.previewMARC").each(function() { >- $(this).attr("href", url + "record_type=" + $(this).attr("data-record_type") + "&record_id=" + $(this).attr("data-record_id") + "&mmtid=" + mmtid); >+ $(this).attr("href", url + "record_type=" + $(this).attr("data-record_type") + "&record_id=" + $(this).attr("data-record_id") + "&mmtid=" + mmtid + "&overlay_context=batchmod"); > }); > }); > >diff --git a/svc/records/preview b/svc/records/preview >index 643fb62fd3..2bc1afcc85 100755 >--- a/svc/records/preview >+++ b/svc/records/preview >@@ -20,14 +20,17 @@ > use Modern::Perl; > use CGI; > use C4::Auth qw( get_template_and_user ); >-use C4::Biblio qw( GetMarcBiblio ); >+use C4::Biblio qw( GetMarcBiblio ApplyMarcOverlayRules ); > use C4::MarcModificationTemplates qw( ModifyRecordWithTemplate ); > use C4::Output qw( output_html_with_http_headers ); >+ > use Koha::MetadataRecord::Authority; >+use Koha::Patrons; > > my $query = CGI->new(); > my $record_id = $query->param('record_id'); > my $record_type = $query->param('record_type') || 'biblio'; >+my $overlay_context = $query->param('overlay_context'); > my $mmtid = $query->param('mmtid'); # Marc modification template id > > my $record; >@@ -38,15 +41,34 @@ if ( $record_type eq 'biblio' ) { > $record = $authority->record; > } > >-if ( $mmtid ) { >- ModifyRecordWithTemplate( $mmtid, $record ); >-} >- > my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ > template_name => "catalogue/showmarc.tt", > query => $query, > type => "intranet", > }); > >+ >+if ($mmtid) { >+ ModifyRecordWithTemplate( $mmtid, $record ); >+ >+ if ( $record_type eq 'biblio' >+ && C4::Context->preference('MARCOverlayRules') >+ && $overlay_context ) >+ { >+ my $logged_in_user = Koha::Patrons->find($loggedinuser); >+ $record = ApplyMarcOverlayRules( >+ { >+ biblionumber => $record_id, >+ record => $record, >+ overlay_context => { >+ source => $overlay_context, >+ categorycode => $logged_in_user->categorycode, >+ userid => $logged_in_user->userid >+ }, >+ } >+ ); >+ } >+} >+ > $template->param( MARC_FORMATTED => $record->as_formatted ); > output_html_with_http_headers $query, $cookie, $template->output; >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14957
:
44056
|
44057
|
44058
|
51723
|
51724
|
56637
|
56638
|
56643
|
56644
|
56645
|
56646
|
56647
|
56648
|
57114
|
57115
|
57116
|
57117
|
57118
|
57119
|
59811
|
59812
|
59885
|
60711
|
60824
|
60825
|
61065
|
61641
|
61736
|
64792
|
72498
|
74855
|
75118
|
76201
|
76202
|
76203
|
76204
|
76205
|
76206
|
76207
|
76208
|
76209
|
76210
|
78651
|
78652
|
78653
|
79367
|
79368
|
79369
|
79370
|
79890
|
80972
|
80973
|
80974
|
80975
|
81176
|
81177
|
81178
|
81179
|
81621
|
81699
|
81700
|
81705
|
81706
|
81707
|
81708
|
81969
|
81970
|
81971
|
82030
|
82031
|
82775
|
87709
|
87711
|
87771
|
87929
|
88205
|
88206
|
89961
|
90668
|
90669
|
90671
|
90672
|
90722
|
90723
|
90740
|
90741
|
92933
|
92934
|
92935
|
92936
|
92937
|
92938
|
92999
|
93499
|
94909
|
94911
|
99998
|
100052
|
100053
|
100054
|
100055
|
100056
|
100057
|
100058
|
100059
|
100060
|
100061
|
101510
|
109955
|
109956
|
109957
|
109958
|
109959
|
109960
|
109961
|
109962
|
109963
|
116622
|
116623
|
116624
|
116625
|
117844
|
117845
|
117849
|
117850
|
117853
|
117859
|
117964
|
117965
|
117966
|
118918
|
118919
|
118920
|
118921
|
118922
|
118923
|
118924
|
118925
|
118926
|
118927
|
118934
|
118935
|
118936
|
118937
|
118938
|
118939
|
118940
|
118941
|
118942
|
118943
|
118944
|
118945
|
118946
|
118957
|
120533
|
120534
|
120535
|
120536
|
120537
|
120538
|
120539
|
120540
|
120541
|
120542
|
120543
|
120544
|
120545
|
120546
|
120547
|
120548
|
120550
|
120553
|
120554
|
120555
|
120556
|
120557
|
120581
|
120582
|
120583
|
120584
|
120585
|
120586
|
120587
|
120588
|
120589
|
120590
|
120591
|
120592
|
120593
|
120594
|
120595
|
120596
|
120597
|
120598
|
120599
|
120600
|
120601
|
120602
|
120603
|
120604
|
120605
|
120670
|
120671
|
120705
|
125514
|
125515
|
125516
|
125517
|
125518
|
125519
|
125520
|
125521
|
125522
|
125523
|
125524
|
125525
|
125526
|
125527
|
125528
|
125529
|
125530
|
125531
|
125532
|
125533
|
125534
|
125535
|
125536
|
125537
|
125538
|
125539
|
125540
|
125632
|
125633
|
125636
|
126424
|
126425
|
126431
|
126592
|
126666
|
126667
|
126752
|
126753
|
126754
|
126755
|
126756
|
126757
|
126758
|
126759
|
126760
|
126761
|
126762
|
126763
|
126764
|
126765
|
126766
|
126767
|
126768
|
126769
|
126770
|
126771
|
126772
|
126773
|
126774
|
126775
|
126776
|
126777
|
126778
|
126779
|
126780
|
126781
|
126782
| 126783 |
126784
|
126785
|
126786
|
126950
|
126951