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

(-)a/about.pl (+8 lines)
Lines 26-31 use CGI qw ( -utf8 ); Link Here
26
use DateTime::TimeZone;
26
use DateTime::TimeZone;
27
use List::MoreUtils qw/ any /;
27
use List::MoreUtils qw/ any /;
28
use LWP::Simple;
28
use LWP::Simple;
29
use Module::Load::Conditional qw(can_load);
29
use XML::Simple;
30
use XML::Simple;
30
use Config;
31
use Config;
31
use Search::Elasticsearch;
32
use Search::Elasticsearch;
Lines 391-396 if ( C4::Context->preference('SearchEngine') eq 'Elasticsearch' ) { Link Here
391
    }
392
    }
392
}
393
}
393
394
395
if ( C4::Context->preference('RESTOAuth2ClientCredentials') ) {
396
    # Do we have the required deps?
397
    unless ( can_load( modules => { 'Net::OAuth2::AuthorizationServer' => undef }) ) {
398
        $template->param( oauth2_missing_deps => 1 );
399
    }
400
}
401
394
# Sco Patron should not contain any other perms than circulate => self_checkout
402
# Sco Patron should not contain any other perms than circulate => self_checkout
395
if (  C4::Context->preference('WebBasedSelfCheck')
403
if (  C4::Context->preference('WebBasedSelfCheck')
396
      and C4::Context->preference('AutoSelfCheckAllowed')
404
      and C4::Context->preference('AutoSelfCheckAllowed')
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-2 / +7 lines)
Lines 183-189 Link Here
183
        </div>
183
        </div>
184
184
185
        <div id="sysinfo">
185
        <div id="sysinfo">
186
    [% IF warnPrefBiblioAddsAuthorities || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatron || warnPrefAnonymousPatron_PatronDoesNotExist || warnNoActiveCurrency || QueryParserError || warnIsRootUser || xml_config_warnings.size || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError || warnNoTemplateCaching || warnILLConfiguration || has_ai_issues %]
186
    [% IF warnPrefBiblioAddsAuthorities || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatron || warnPrefAnonymousPatron_PatronDoesNotExist || warnNoActiveCurrency || QueryParserError || warnIsRootUser || xml_config_warnings.size || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError || warnNoTemplateCaching || warnILLConfiguration || has_ai_issues || oauth2_missing_deps %]
187
        [% IF (warnIsRootUser) %]
187
        [% IF (warnIsRootUser) %]
188
            <h2>Warning regarding current user</h2>
188
            <h2>Warning regarding current user</h2>
189
            <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>
189
            <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 228-234 Link Here
228
            <br/>
228
            <br/>
229
        [% END %]
229
        [% END %]
230
230
231
        [% IF warnPrefBiblioAddsAuthorities || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatron || warnPrefAnonymousPatron_PatronDoesNotExist || warnNoActiveCurrency || QueryParserError || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError || warnNoTemplateCaching || warnILLConfiguration %]
231
        [% IF warnPrefBiblioAddsAuthorities || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatron || warnPrefAnonymousPatron_PatronDoesNotExist || warnNoActiveCurrency || QueryParserError || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError || warnNoTemplateCaching || warnILLConfiguration || oauth2_missing_deps %]
232
            <h2>Warnings regarding the system configuration</h2>
232
            <h2>Warnings regarding the system configuration</h2>
233
            <table>
233
            <table>
234
                <caption>Preferences and parameters</caption>
234
                <caption>Preferences and parameters</caption>
Lines 295-300 Link Here
295
                    </td></tr>
295
                    </td></tr>
296
                  [% END %]
296
                  [% END %]
297
                [% END %]
297
                [% END %]
298
                [% IF oauth2_missing_deps %]
299
                    <tr><th scope="row"><b>Warning</b> </th><td>
300
                    System preference 'RESTOAuth2ClientCredentials' is set, but the required Net::OAuth2::AuthorizationServer dependency is missing. The feature is disabled.
301
                    </td></tr>
302
                [% END %]
298
            </table>
303
            </table>
299
        [% END %]
304
        [% END %]
300
305
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref (-2 / +1 lines)
Lines 10-16 Web services: Link Here
10
              choices:
10
              choices:
11
                  yes: Enable
11
                  yes: Enable
12
                  no: "Disable"
12
                  no: "Disable"
13
            - "the OAuth2 client credentials grant for the REST API."
13
            - "the OAuth2 client credentials grant for the REST API. Requires Net::OAuth2::AuthorizationServer installed. [EXPERIMENTAL]"
14
    OAI-PMH:
14
    OAI-PMH:
15
        -
15
        -
16
            - pref: OAI-PMH
16
            - pref: OAI-PMH
17
- 

Return to bug 20624