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

(-)a/about.pl (+7 lines)
Lines 320-325 if ( C4::Context->preference('ILLModule') ) { Link Here
320
        $warnILLConfiguration = 1;
320
        $warnILLConfiguration = 1;
321
    }
321
    }
322
322
323
    # Check if deprecated 'FreeForm' backend is installed
324
    my $available_backends = Koha::ILL::Request::Config->new->available_backends;
325
    if(grep(/FreeForm/, @{$available_backends} )){
326
        $template->param( ill_deprecated_backend_freeform_is_installed => 1 );
327
        $warnILLConfiguration = 1;
328
    }
329
323
    if ( !C4::Context->preference('ILLPartnerCode') ) {
330
    if ( !C4::Context->preference('ILLPartnerCode') ) {
324
        # partner code not defined
331
        # partner code not defined
325
        $template->param( ill_partner_code_not_defined => 1 );
332
        $template->param( ill_partner_code_not_defined => 1 );
(-)a/ill/ill-requests.pl (+6 lines)
Lines 72-77 $template->param( Link Here
72
    have_batch         => have_batch_backends($backends)
72
    have_batch         => have_batch_backends($backends)
73
);
73
);
74
74
75
if ( grep( /FreeForm/, @{$backends} ) ) {
76
    $template->param(
77
        ill_deprecated_backend_freeform_is_installed => 1,
78
    );
79
}
80
75
if ( $backends_available ) {
81
if ( $backends_available ) {
76
    # Establish what metadata enrichment plugins we have available
82
    # Establish what metadata enrichment plugins we have available
77
    my $enrichment_services = get_metadata_enrichment();
83
    my $enrichment_services = get_metadata_enrichment();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (+11 lines)
Lines 569-574 Link Here
569
                                                </td>
569
                                                </td>
570
                                            </tr>
570
                                            </tr>
571
                                        [% END %]
571
                                        [% END %]
572
                                        [% IF ill_deprecated_backend_freeform_is_installed %]
573
                                            <tr>
574
                                                <th scope="row"><strong>Warning</strong> </th>
575
                                                <td>
576
                                                    <p>The ILL module is enabled, but the deprecated 'FreeForm' backend is installed.</p>
577
                                                    <p>'FreeForm' has since become part of core Koha as 'Standard'.</p>
578
                                                    <p>All 'FreeForm' ILL content should've been migrated to 'Standard' upon upgrading Koha to 24.05.</p>
579
                                                    <p>To avoid confusion or redundancy, please uninstall the 'FreeForm' backend before using the ILL module.</p>
580
                                                </td>
581
                                            </tr>
582
                                        [% END %]
572
                                    [% END %]
583
                                    [% END %]
573
584
574
                                    [% IF weasyprint_missing %]
585
                                    [% IF weasyprint_missing %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-2 / +1 lines)
Lines 125-131 Link Here
125
                    [% INCLUDE 'messages.inc' %]
125
                    [% INCLUDE 'messages.inc' %]
126
        [% END %]
126
        [% END %]
127
            <div id="interlibraryloans">
127
            <div id="interlibraryloans">
128
        [% IF !backends_available || !has_branch %]
128
        [% IF !backends_available || !has_branch || ill_deprecated_backend_freeform_is_installed %]
129
            <div class="dialog message">ILL module configuration problem. Take a look at the <a href="/cgi-bin/koha/about.pl#sysinfo_panel">about page</a></div>
129
            <div class="dialog message">ILL module configuration problem. Take a look at the <a href="/cgi-bin/koha/about.pl#sysinfo_panel">about page</a></div>
130
        [% ELSE %]
130
        [% ELSE %]
131
                [% INCLUDE 'ill-toolbar.inc' %]
131
                [% INCLUDE 'ill-toolbar.inc' %]
132
- 

Return to bug 35570