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

(-)a/C4/UsageStats.pm (-1 / +1 lines)
Lines 153-159 sub _shared_preferences { Link Here
153
        AuthDisplayHierarchy
153
        AuthDisplayHierarchy
154
        AutoCreateAuthorities
154
        AutoCreateAuthorities
155
        AutoLinkBiblios
155
        AutoLinkBiblios
156
        AllowManualAuthorityEditing
156
        RequireChoosingExistingAuthority
157
        AuthorityMergeLimit
157
        AuthorityMergeLimit
158
        AuthorityMergeMode
158
        AuthorityMergeMode
159
        UseAuthoritiesForTracings
159
        UseAuthoritiesForTracings
(-)a/about.pl (-4 / +4 lines)
Lines 172-179 if ($prefStatisticsFields) { Link Here
172
}
172
}
173
173
174
my $prefAutoCreateAuthorities = C4::Context->preference('AutoCreateAuthorities');
174
my $prefAutoCreateAuthorities = C4::Context->preference('AutoCreateAuthorities');
175
my $prefAllowManualAuthorityEditing = C4::Context->preference('AllowManualAuthorityEditing');
175
my $prefRequireChoosingExistingAuthority = C4::Context->preference('RequireChoosingExistingAuthority');
176
my $warnPrefAllowManualAuthorityEditing = ( $prefAutoCreateAuthorities && ( !$prefAllowManualAuthorityEditing) );
176
my $warnPrefRequireChoosingExistingAuthority = ( !$prefAutoCreateAuthorities && ( !$prefRequireChoosingExistingAuthority) );
177
177
178
my $prefEasyAnalyticalRecords  = C4::Context->preference('EasyAnalyticalRecords');
178
my $prefEasyAnalyticalRecords  = C4::Context->preference('EasyAnalyticalRecords');
179
my $prefUseControlNumber  = C4::Context->preference('UseControlNumber');
179
my $prefUseControlNumber  = C4::Context->preference('UseControlNumber');
Lines 632-640 $template->param( Link Here
632
    mysqlVersion  => $versions{'mysqlVersion'},
632
    mysqlVersion  => $versions{'mysqlVersion'},
633
    apacheVersion => $versions{'apacheVersion'},
633
    apacheVersion => $versions{'apacheVersion'},
634
    zebraVersion  => $zebraVersion,
634
    zebraVersion  => $zebraVersion,
635
    prefAllowManualAuthorityEditing => $prefAllowManualAuthorityEditing,
635
    prefRequireChoosingExistingAuthority => $prefRequireChoosingExistingAuthority,
636
    prefAutoCreateAuthorities => $prefAutoCreateAuthorities,
636
    prefAutoCreateAuthorities => $prefAutoCreateAuthorities,
637
    warnPrefAllowManualAuthorityEditing => $warnPrefAllowManualAuthorityEditing,
637
    warnPrefRequireChoosingExistingAuthority => $warnPrefRequireChoosingExistingAuthority,
638
    warnPrefEasyAnalyticalRecords  => $warnPrefEasyAnalyticalRecords,
638
    warnPrefEasyAnalyticalRecords  => $warnPrefEasyAnalyticalRecords,
639
    warnPrefAnonymousPatronOPACPrivacy        => $warnPrefAnonymousPatronOPACPrivacy,
639
    warnPrefAnonymousPatronOPACPrivacy        => $warnPrefAnonymousPatronOPACPrivacy,
640
    warnPrefAnonymousPatronAnonSuggestions    => $warnPrefAnonymousPatronAnonSuggestions,
640
    warnPrefAnonymousPatronAnonSuggestions    => $warnPrefAnonymousPatronAnonSuggestions,
(-)a/cataloguing/addbiblio.pl (-1 / +1 lines)
Lines 376-382 sub create_input { Link Here
376
    }
376
    }
377
    elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) {
377
    elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) {
378
        # when authorities auto-creation is allowed, do not set readonly
378
        # when authorities auto-creation is allowed, do not set readonly
379
        my $is_readonly = !C4::Context->preference("AllowManualAuthorityEditing");
379
        my $is_readonly = C4::Context->preference("RequireChoosingExistingAuthority");
380
380
381
        $subfield_data{marc_value} = {
381
        $subfield_data{marc_value} = {
382
            type      => 'text',
382
            type      => 'text',
(-)a/installer/data/mysql/atomicupdate/bug_30025.pl (-3 / +3 lines)
Lines 11-20 return { Link Here
11
        $dbh->do(q{
11
        $dbh->do(q{
12
            INSERT IGNORE INTO systempreferences
12
            INSERT IGNORE INTO systempreferences
13
            ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
13
            ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
14
            ('AllowManualAuthorityEditing',?,NULL,'Allow manual entry in controlled fields during cataloging.','YesNo'),
14
            ('RequireChoosingExistingAuthority',?,NULL,'Require selecting existing authority entry in controlled fields during cataloging.','YesNo'),
15
            ('AutoLinkBiblios',?,NULL,'If enabled, link biblio to authorities on creation and edit','YesNo')
15
            ('AutoLinkBiblios',?,NULL,'If enabled, link biblio to authorities on creation and edit','YesNo')
16
        },undef,($biblio_adds_authorities,$biblio_adds_authorities));
16
        },undef,($biblio_adds_authorities eq '1' ? '0' : '1', $biblio_adds_authorities));
17
        say $out "Added AllowManualAuthorityEditing and AutoLinkBiblios";
17
        say $out "Added RequireChoosingExistingAuthority and AutoLinkBiblios";
18
        $dbh->do(q{DELETE FROM systempreferences WHERE variable="BiblioAddsAuthorities";});
18
        $dbh->do(q{DELETE FROM systempreferences WHERE variable="BiblioAddsAuthorities";});
19
        say $out "BiblioAddsAuthorities removed";
19
        say $out "BiblioAddsAuthorities removed";
20
    },
20
    },
(-)a/installer/data/mysql/mandatory/sysprefs.sql (-1 / +1 lines)
Lines 31-37 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
31
('AllowCheckoutNotes', '0', NULL, 'Allow patrons to submit notes about checked out items.','YesNo'),
31
('AllowCheckoutNotes', '0', NULL, 'Allow patrons to submit notes about checked out items.','YesNo'),
32
('AllowItemsOnHoldCheckoutSIP','0','','Do not generate RESERVED warning when checking out items reserved to someone else via SIP. This allows self checkouts for those items.','YesNo'),
32
('AllowItemsOnHoldCheckoutSIP','0','','Do not generate RESERVED warning when checking out items reserved to someone else via SIP. This allows self checkouts for those items.','YesNo'),
33
('AllowItemsOnHoldCheckoutSCO','0','','Do not generate RESERVE_WAITING and RESERVED warning in the SCO module when checking out items reserved to someone else. This allows self checkouts for those items.','YesNo'),
33
('AllowItemsOnHoldCheckoutSCO','0','','Do not generate RESERVE_WAITING and RESERVED warning in the SCO module when checking out items reserved to someone else. This allows self checkouts for those items.','YesNo'),
34
('AllowManualAuthorityEditing','0',NULL,'Allow manual entry in controlled fields during cataloging.','YesNo'),
35
('AllowMultipleCovers','0','1','Allow multiple cover images to be attached to each bibliographic record.','YesNo'),
34
('AllowMultipleCovers','0','1','Allow multiple cover images to be attached to each bibliographic record.','YesNo'),
36
('AllowMultipleIssuesOnABiblio',1,'Allow/Don\'t allow patrons to check out multiple items from one biblio','','YesNo'),
35
('AllowMultipleIssuesOnABiblio',1,'Allow/Don\'t allow patrons to check out multiple items from one biblio','','YesNo'),
37
('AllowNotForLoanOverride','0','','If ON, Koha will allow the librarian to loan a not for loan item.','YesNo'),
36
('AllowNotForLoanOverride','0','','If ON, Koha will allow the librarian to loan a not for loan item.','YesNo'),
Lines 590-595 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
590
('ReplyToDefault','',NULL,'Use this email address as the replyto in emails','Free'),
589
('ReplyToDefault','',NULL,'Use this email address as the replyto in emails','Free'),
591
('ReportsLog','0',NULL,'If ON, log information about reports.','YesNo'),
590
('ReportsLog','0',NULL,'If ON, log information about reports.','YesNo'),
592
('RequireCashRegister','0',NULL,'Require a cash register when collecting a payment','YesNo'),
591
('RequireCashRegister','0',NULL,'Require a cash register when collecting a payment','YesNo'),
592
('RequireChoosingExistingAuthority','0',NULL,'Require existing authority selection in controlled fields during cataloging.','YesNo'),
593
('RequirePaymentType','0','','Require staff to select a payment type when a payment is made','YesNo'),
593
('RequirePaymentType','0','','Require staff to select a payment type when a payment is made','YesNo'),
594
('RequireStrongPassword','1','','Require a strong login password for staff and patrons','YesNo'),
594
('RequireStrongPassword','1','','Require a strong login password for staff and patrons','YesNo'),
595
('ReservesControlBranch','PatronLibrary','ItemHomeLibrary|PatronLibrary','Branch checked for members reservations rights','Choice'),
595
('ReservesControlBranch','PatronLibrary','ItemHomeLibrary|PatronLibrary','Branch checked for members reservations rights','Choice'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-4 / +4 lines)
Lines 216-222 Link Here
216
        </div>
216
        </div>
217
217
218
        <div role="tabpanel" class="tab-pane" id="sysinfo">
218
        <div role="tabpanel" class="tab-pane" id="sysinfo">
219
    [% IF warnAllowManualAuthorityEditing || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatronOPACPrivacy || warnPrefAnonymousPatronAnonSuggestions || warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist || warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist || warnPrefKohaAdminEmailAddress || warnPrefOpacHiddenItems || invalid_yesno.count || warnNoActiveCurrency || warnIsRootUser || xml_config_warnings.size || 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 %]
219
    [% IF warnRequireChoosingExistingAuthority || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatronOPACPrivacy || warnPrefAnonymousPatronAnonSuggestions || warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist || warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist || warnPrefKohaAdminEmailAddress || warnPrefOpacHiddenItems || invalid_yesno.count || warnNoActiveCurrency || warnIsRootUser || xml_config_warnings.size || 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 %]
220
        [% IF (warnIsRootUser) %]
220
        [% IF (warnIsRootUser) %]
221
            <h2>Warning regarding current user</h2>
221
            <h2>Warning regarding current user</h2>
222
            <p>You are logged in as the database administrative user. This is not recommended because some parts of Koha will not function as expected when using this account.</p>
222
            <p>You are logged in as the database administrative user. This is not recommended because some parts of Koha will not function as expected when using this account.</p>
Lines 300-311 Link Here
300
            Contact your system administrator.
300
            Contact your system administrator.
301
        [% END %]
301
        [% END %]
302
302
303
        [% IF warnPrefAllowManualAuthorityEditing || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatronOPACPrivacy || warnPrefAnonymousPatronAnonSuggestions || warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist || warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist || warnPrefKohaAdminEmailAddress || warnPrefOpacHiddenItems || invalid_yesno.count || warnNoActiveCurrency || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError || warnNoTemplateCaching || warnILLConfiguration || warnXSLT || oauth2_missing_deps || bad_yaml_prefs || warnIssuingRules || config_bcrypt_settings_no_set || warnHiddenBiblionumbers.size %]
303
        [% IF warnPrefRequireChoosingExistingAuthority || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatronOPACPrivacy || warnPrefAnonymousPatronAnonSuggestions || warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist || warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist || warnPrefKohaAdminEmailAddress || warnPrefOpacHiddenItems || invalid_yesno.count || warnNoActiveCurrency || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError || warnNoTemplateCaching || warnILLConfiguration || warnXSLT || oauth2_missing_deps || bad_yaml_prefs || warnIssuingRules || config_bcrypt_settings_no_set || warnHiddenBiblionumbers.size %]
304
            <h2>Warnings regarding the system configuration</h2>
304
            <h2>Warnings regarding the system configuration</h2>
305
            <table>
305
            <table>
306
                <caption>Preferences and parameters</caption>
306
                <caption>Preferences and parameters</caption>
307
                [% IF (warnPrefAllowManualAuthorityEditing) %]
307
                [% IF (warnPrefRequireChoosingExistingAuthority) %]
308
                <tr><th scope="row"><strong>Warning</strong> </th><td>System preference 'AutoCreateAuthorities' set, but needs 'AllowManualAuthorityEditing' set as well. Otherwise catalogers can add headings that will not be linked to authorities.</td></tr>
308
                <tr><th scope="row"><strong>Warning</strong> </th><td>System preference 'RequireChoosingExistingAuthority' is disabled, but needs 'AutoCreateAuthorites' enabled. Otherwise catalogers can add headings that will not be linked to authorities.</td></tr>
309
                [% END %]
309
                [% END %]
310
                [% IF (warnPrefEasyAnalyticalRecords) %]
310
                [% IF (warnPrefEasyAnalyticalRecords) %]
311
                <tr><th scope="row"><strong>Warning</strong> </th><td>System preference 'EasyAnalyticalRecords' set, but UseControlNumber preference is set to 'Use'. Set it to 'Don't use' or else the 'Show analytics' links in the staff interface and the OPAC will be broken.</td></tr>
311
                <tr><th scope="row"><strong>Warning</strong> </th><td>System preference 'EasyAnalyticalRecords' set, but UseControlNumber preference is set to 'Use'. Set it to 'Don't use' or else the 'Show analytics' links in the staff interface and the OPAC will be broken.</td></tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref (-9 / +8 lines)
Lines 16-27 Authorities: Link Here
16
              type: textarea
16
              type: textarea
17
        -
17
        -
18
            - When editing records,
18
            - When editing records,
19
            - pref: AllowManualAuthorityEditing
19
            - pref: RequireChoosingExistingAuthority
20
              default: no
20
              default: yes
21
              choices:
21
              choices:
22
                  1: allow
22
                  1: require
23
                  0: "don't allow"
23
                  0: "don't require"
24
            - catalogers to manually create new headings if needed, rather than having to reference existing authorities.
24
            - catalogers to reference existing authorities. If set to don't, catalogers can manually enter uncontrolled terms into controlled fields
25
        -
25
        -
26
            - When editing records,
26
            - When editing records,
27
            - pref: AutoCreateAuthorities
27
            - pref: AutoCreateAuthorities
Lines 29-35 Authorities: Link Here
29
              choices:
29
              choices:
30
                  1: generate
30
                  1: generate
31
                  0: "don't generate"
31
                  0: "don't generate"
32
            - authority records that are missing (<a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=AllowManualAuthorityEditing">AllowManualAuthorityEditing</a> must be set to "allow" for this to have any effect).
32
            - authority records that are missing (<a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RequireChoosingExistingAuthority">RequireChoosingExistingAuthority</a> must be set to "don't require" for this to have any effect).
33
        -
33
        -
34
            - When modifying an authority record, do not update attached bibliographic records if the number exceeds
34
            - When modifying an authority record, do not update attached bibliographic records if the number exceeds
35
            - pref: AuthorityMergeLimit
35
            - pref: AuthorityMergeLimit
Lines 64-76 Authorities: Link Here
64
                  "strict": strict
64
                  "strict": strict
65
            - mode. In strict mode subfields that are not found in the authority record, are deleted. Loose mode will keep them. Loose mode is the historical behavior and still the default.
65
            - mode. In strict mode subfields that are not found in the authority record, are deleted. Loose mode will keep them. Loose mode is the historical behavior and still the default.
66
        -
66
        -
67
            - "Use the following text as default value for the 667$a field of MARC21 authority records (requires <a href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=AllowManualAuthorityEditing'>AllowManualAuthorityEditing</a> and <a href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=AutoCreateAuthorities'>AutoCreateAuthorities</a>):"
67
            - "Use the following text as default value for the 667$a field of MARC21 authority records (must not require <a href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RequireChoosingExistingAuthority'>RequireChoosingExistingAuthority</a> and must allow <a href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=AutoCreateAuthorities'>AutoCreateAuthorities</a>):"
68
            - pref: GenerateAuthorityField667
68
            - pref: GenerateAuthorityField667
69
              default: "Machine generated authority record"
69
              default: "Machine generated authority record"
70
              type: textarea
70
              type: textarea
71
              class: code
71
              class: code
72
        -
72
        -
73
            - "Use the following text as default value for the 670$a field of MARC21 authority records (requires <a href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=AllowManualAuthorityEditing'>AllowManualAuthorityEditing</a> and <a href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=AutoCreateAuthorities'>AutoCreateAuthorities</a>):"
73
            - "Use the following text as default value for the 670$a field of MARC21 authority records (must not require <a href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RequireChoosingExistingAuthority'>RequireChoosingExistingAuthority</a> and must allow <a href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=AutoCreateAuthorities'>AutoCreateAuthorities</a>):"
74
            - pref: GenerateAuthorityField670
74
            - pref: GenerateAuthorityField670
75
              default: "Work cat."
75
              default: "Work cat."
76
              type: textarea
76
              type: textarea
77
- 

Return to bug 30025