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

(-)a/about.pl (+16 lines)
Lines 33-38 use Search::Elasticsearch; Link Here
33
use Try::Tiny qw( catch try );
33
use Try::Tiny qw( catch try );
34
use YAML::XS;
34
use YAML::XS;
35
use Encode;
35
use Encode;
36
use Array::Utils qw( array_diff );
36
37
37
use C4::Output qw( output_html_with_http_headers );
38
use C4::Output qw( output_html_with_http_headers );
38
use C4::Auth qw( get_template_and_user get_user_subpermissions );
39
use C4::Auth qw( get_template_and_user get_user_subpermissions );
Lines 649-654 $template->param( 'bad_yaml_prefs' => \@bad_yaml_prefs ) if @bad_yaml_prefs; Link Here
649
    }
650
    }
650
}
651
}
651
652
653
# BZ 34063: Warn administrators if there are columns in items that are not in deleteditems or vice-versa
654
{
655
    my $dbh = C4::Context->dbh;
656
657
    my $items_columns      = $dbh->selectall_arrayref( qq|SHOW COLUMNS FROM items|, { Slice => {} } );
658
    my @items_column_names = map( $_->{Field}, @{$items_columns} );
659
660
    my $deleted_items_columns      = $dbh->selectall_arrayref( qq|SHOW COLUMNS FROM deleteditems|, { Slice => {} } );
661
    my @deleted_items_column_names = map( $_->{Field}, @{$deleted_items_columns} );
662
663
    my @array_diff = array_diff( @items_column_names, @deleted_items_column_names );
664
665
    $template->param( itemsTablesColumnsMismatch => \@array_diff ) if @array_diff;
666
}
667
652
#BZ 28267: Warn administrators if there are database rows with a format other than 'DYNAMIC'
668
#BZ 28267: Warn administrators if there are database rows with a format other than 'DYNAMIC'
653
{
669
{
654
    $template->param( warnDbRowFormat => C4::Installer->has_non_dynamic_row_format );
670
    $template->param( warnDbRowFormat => C4::Installer->has_non_dynamic_row_format );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-3 / +16 lines)
Lines 274-280 Link Here
274
                        [% SET warnMissingCompiledFiles = 1 %]
274
                        [% SET warnMissingCompiledFiles = 1 %]
275
                    [% END %]
275
                    [% END %]
276
                    [% WRAPPER tab_panel tabname= "sysinfo" %]
276
                    [% WRAPPER tab_panel tabname= "sysinfo" %]
277
                        [% IF weasyprint_missing || warnPrefRequireChoosingExistingAuthority || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatronOPACPrivacy || warnPrefAnonymousPatronAnonSuggestions || warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist || warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist || warnPrefKohaAdminEmailAddress || warnPrefOpacHiddenItems || warnPrefPatronSelfRegistrationDefaultCategory || invalid_yesno.count || warnNoActiveCurrency || warnIsRootUser || xml_config_warnings.size || warnI18nMissing || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError || warnNoTemplateCaching || warnILLConfiguration || has_ai_issues || oauth2_missing_deps || bad_yaml_prefs || warnRelationships || log4perl_errors || config_bcrypt_settings_no_set || warnHiddenBiblionumbers.size || warnConnectBroker || elasticsearch_has_missing || warnMissingCompiledFiles || warnDbRowFormat %]
277
                        [% IF weasyprint_missing || warnPrefRequireChoosingExistingAuthority || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatronOPACPrivacy || warnPrefAnonymousPatronAnonSuggestions || warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist || warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist || warnPrefKohaAdminEmailAddress || warnPrefOpacHiddenItems || warnPrefPatronSelfRegistrationDefaultCategory || invalid_yesno.count || warnNoActiveCurrency || warnIsRootUser || xml_config_warnings.size || warnI18nMissing || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError || warnNoTemplateCaching || warnILLConfiguration || has_ai_issues || oauth2_missing_deps || bad_yaml_prefs || warnRelationships || log4perl_errors || config_bcrypt_settings_no_set || warnHiddenBiblionumbers.size || warnConnectBroker || elasticsearch_has_missing || warnMissingCompiledFiles || warnDbRowFormat || itemsTablesColumnsMismatch %]
278
                            [% IF ( warnDbRowFormat ) %]
278
                            [% IF ( warnDbRowFormat ) %]
279
                                <h2>Database row format incorrect</h2>
279
                                <h2>Database row format incorrect</h2>
280
                                <p>Database tables with a row format other than 'DYNAMIC': [% warnDbRowFormat | html %]</p>
280
                                <p>Database tables with a row format other than 'DYNAMIC': [% warnDbRowFormat | html %]</p>
Lines 408-414 Link Here
408
                                Contact your system administrator.
408
                                Contact your system administrator.
409
                            [% END # /IF warnConnectBroker %]
409
                            [% END # /IF warnConnectBroker %]
410
410
411
                            [% IF weasyprint_missing || warnPrefRequireChoosingExistingAuthority || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatronOPACPrivacy || warnPrefAnonymousPatronAnonSuggestions || warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist || warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist || warnPrefKohaAdminEmailAddress || warnPrefOpacHiddenItems || warnPrefPatronSelfRegistrationDefaultCategory || invalid_yesno.count || warnNoActiveCurrency || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError || warnNoTemplateCaching || warnILLConfiguration || warnXSLT || oauth2_missing_deps || bad_yaml_prefs || warnIssuingRules || config_bcrypt_settings_no_set || warnHiddenBiblionumbers.size || warnFastCataloging %]
411
                            [% IF weasyprint_missing || warnPrefRequireChoosingExistingAuthority || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatronOPACPrivacy || warnPrefAnonymousPatronAnonSuggestions || warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist || warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist || warnPrefKohaAdminEmailAddress || warnPrefOpacHiddenItems || warnPrefPatronSelfRegistrationDefaultCategory || invalid_yesno.count || warnNoActiveCurrency || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError || warnNoTemplateCaching || warnILLConfiguration || warnXSLT || oauth2_missing_deps || bad_yaml_prefs || warnIssuingRules || config_bcrypt_settings_no_set || warnHiddenBiblionumbers.size || warnFastCataloging || itemsTablesColumnsMismatch %]
412
                                <h2>Warnings regarding the system configuration</h2>
412
                                <h2>Warnings regarding the system configuration</h2>
413
                                <table>
413
                                <table>
414
                                    <caption>Preferences and parameters</caption>
414
                                    <caption>Preferences and parameters</caption>
Lines 619-624 Link Here
619
                                            </td>
619
                                            </td>
620
                                        </tr>
620
                                        </tr>
621
                                    [% END %]
621
                                    [% END %]
622
                                    [% IF itemsTablesColumnsMismatch %]
623
                                        <tr>
624
                                            <th scope="row">
625
                                                <strong>Warning</strong>
626
                                            </th>
627
                                            <td>
628
                                                Database tables for <strong>items</strong> and <strong>deleteditems</strong> should match, but do not. Mismatching columns: <strong>
629
                                                [% FOREACH column IN itemsTablesColumnsMismatch %]
630
                                                    [% column | html %]
631
                                                [% END %]
632
                                                </strong>
633
                                            </td>
634
                                        </tr>
635
                                    [% END # /IF itemsTablesColumnsMismatch %]
622
                                </table>
636
                                </table>
623
                            [% END # /IF warnPrefRequireChoosingExistingAuthority %]
637
                            [% END # /IF warnPrefRequireChoosingExistingAuthority %]
624
638
625
- 

Return to bug 34063