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

(-)a/installer/data/mysql/atomicupdate/bug_27378_add_ConsentJS_syspref.perl (+8 lines)
Line 0 Link Here
1
$DBversion = 'XXX'; # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do( q| INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type) VALUES ('ConsentJS', '', 'Specify Javascript that requires user consent to run (e.g. tracking code)', '', 'Free'); | );
4
5
    # Always end with this (adjust the bug info)
6
    SetVersion( $DBversion );
7
    print "Upgrade to $DBversion done (Bug 27378 - Add ConsentJS syspref)\n";
8
}
(-)a/installer/data/mysql/atomicupdate/bug_27378_add_CookieConsentBar_syspref.perl (+8 lines)
Line 0 Link Here
1
$DBversion = 'XXX'; # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do( q{ INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type) VALUES ('CookieConsentBar', '', 'Show the following HTML in the cookie consent bar that is displayed at the bottom of the screen', '70|10', 'Textarea'); } );
4
5
    # Always end with this (adjust the bug info)
6
    SetVersion( $DBversion );
7
    print "Upgrade to $DBversion done (Bug 27378 - Add CookieConsentBar syspref)\n";
8
}
(-)a/installer/data/mysql/atomicupdate/bug_27378_add_CookieConsentPopup_syspref.perl (+8 lines)
Line 0 Link Here
1
$DBversion = 'XXX'; # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do( q| INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type) VALUES ('CookieConsentPopup', '', 'Show the following HTML in the cookie consent popup', '70|10', 'Textarea'); | );
4
5
    # Always end with this (adjust the bug info)
6
    SetVersion( $DBversion );
7
    print "Upgrade to $DBversion done (Bug 27378 - Add CookieConsentPopup syspref)\n";
8
}
(-)a/installer/data/mysql/atomicupdate/bug_27378_add_CookieConsent_syspref.perl (+8 lines)
Line 0 Link Here
1
$DBversion = 'XXX'; # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do( q| INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type) VALUES ('CookieConsent', '0', 'Require cookie consent to be displayed', '', 'YesNo'); | );
4
5
    # Always end with this (adjust the bug info)
6
    SetVersion( $DBversion );
7
    print "Upgrade to $DBversion done (Bug 27378 - Add CookieConsent syspref)\n";
8
}
(-)a/installer/data/mysql/mandatory/sysprefs.sql (+4 lines)
Lines 140-146 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
140
('COinSinOPACResults','1','','If ON, use COinS in OPAC search results page.  NOTE: this can slow down search response time significantly','YesNo'),
140
('COinSinOPACResults','1','','If ON, use COinS in OPAC search results page.  NOTE: this can slow down search response time significantly','YesNo'),
141
('CollapseFieldsPatronAddForm','',NULL,'Collapse these fields by default when adding a new patron. These fields can still be expanded.','Multiple'),
141
('CollapseFieldsPatronAddForm','',NULL,'Collapse these fields by default when adding a new patron. These fields can still be expanded.','Multiple'),
142
('ConfirmFutureHolds','0','','Number of days for confirming future holds','Integer'),
142
('ConfirmFutureHolds','0','','Number of days for confirming future holds','Integer'),
143
('ConsentJS', '', NULL, 'Specify Javascript that requires user consent to run (e.g. tracking code)', 'Free'),
143
('ConsiderOnSiteCheckoutsAsNormalCheckouts','1',NULL,'Consider on-site checkouts as normal checkouts','YesNo'),
144
('ConsiderOnSiteCheckoutsAsNormalCheckouts','1',NULL,'Consider on-site checkouts as normal checkouts','YesNo'),
145
('CookieConsent', '0', NULL, 'Require cookie consent to be displayed', 'YesNo'),
146
('CookieConsentBar', '', '70|10', 'Show the following HTML in the cookie consent bar that is displayed at the bottom of the screen', 'Textarea'),
147
('CookieConsentPopup', '', '70|10', 'Show the following HTML in the cookie consent popup', 'Textarea'),
144
('CronjobLog','0',NULL,'If ON, log information from cron jobs.','YesNo'),
148
('CronjobLog','0',NULL,'If ON, log information from cron jobs.','YesNo'),
145
('CumulativeRestrictionPeriods',0,NULL,'Cumulate the restriction periods instead of keeping the highest','YesNo'),
149
('CumulativeRestrictionPeriods',0,NULL,'Cumulate the restriction periods instead of keeping the highest','YesNo'),
146
('CurrencyFormat','US','US|FR|CH','Determines the display format of currencies. eg: \'36000\' is displayed as \'360 000,00\'  in \'FR\' or \'360,000.00\'  in \'US\'.','Choice'),
150
('CurrencyFormat','US','US|FR|CH','Determines the display format of currencies. eg: \'36000\' is displayed as \'360 000,00\'  in \'FR\' or \'360,000.00\'  in \'US\'.','Choice'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (-1 / +24 lines)
Lines 349-354 Patrons: Link Here
349
         - days and remove anonymized patron accounts after
349
         - days and remove anonymized patron accounts after
350
         - pref: PatronRemovalDelay
350
         - pref: PatronRemovalDelay
351
         - "days.<br>IMPORTANT: No action is performed when these delays are empty (no text). But a zero value ('0') is interpreted as no delay (do it now)! The actions are performed by the cleanup database cron job."
351
         - "days.<br>IMPORTANT: No action is performed when these delays are empty (no text). But a zero value ('0') is interpreted as no delay (do it now)! The actions are performed by the cleanup database cron job."
352
     -
353
         - pref: CookieConsent
354
           choices:
355
               yes: Require
356
               no: "Don't require"
357
         - cookie consent to be displayed
358
     -
359
         - Specify Javascript that requires user consent to run (e.g. tracking code)
360
         - pref: ConsentJS
361
           type: modaljs
362
           initiator: populateConsentJS
363
           processor: prepareConsentJS
364
     -
365
         - Show the following HTML in the cookie consent bar that is displayed at the bottom of the screen
366
         - pref: CookieConsentBar
367
           type: textarea
368
           syntax: text/html
369
           class: code
370
     -
371
         - Show the following HTML in the cookie consent popup
372
         - pref: CookieConsentPopup
373
           type: textarea
374
           syntax: text/html
375
           class: code
352
    Security:
376
    Security:
353
     -
377
     -
354
         - Login passwords for staff and patrons must be at least
378
         - Login passwords for staff and patrons must be at least
355
- 

Return to bug 27378