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

(-)a/installer/data/mysql/sysprefs.sql (+2 lines)
Lines 108-113 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
108
('DefaultLongOverdueLostValue', NULL, NULL, "Set the LOST value of an item to n when the item has been overdue for more than defaultlongoverduedays days.", 'integer'),
108
('DefaultLongOverdueLostValue', NULL, NULL, "Set the LOST value of an item to n when the item has been overdue for more than defaultlongoverduedays days.", 'integer'),
109
('defaultSortField','relevance','relevance|popularity|call_number|pubdate|acqdate|title|author','Specify the default field used for sorting','Choice'),
109
('defaultSortField','relevance','relevance|popularity|call_number|pubdate|acqdate|title|author','Specify the default field used for sorting','Choice'),
110
('defaultSortOrder','dsc','asc|dsc|az|za','Specify the default sort order','Choice'),
110
('defaultSortOrder','dsc','asc|dsc|az|za','Specify the default sort order','Choice'),
111
('DefaultToLoggedInLibraryCircRules',  '0', NULL ,  'If enabled, circ rules editor will default to the logged in library''s rules, rather than the ''all libraries'' rules.',  'YesNo'),
112
('DefaultToLoggedInLibraryNoticesSlips',  '0', NULL ,  'If enabled,slips and notices editor will default to the logged in library''s rules, rather than the ''all libraries'' rules.',  'YesNo'),
111
('delimiter',';',';|tabulation|,|/|\\|#||','Define the default separator character for exporting reports','Choice'),
113
('delimiter',';',';|tabulation|,|/|\\|#||','Define the default separator character for exporting reports','Choice'),
112
('Display856uAsImage','OFF','OFF|Details|Results|Both','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','Choice'),
114
('Display856uAsImage','OFF','OFF|Details|Results|Both','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','Choice'),
113
('DisplayClearScreenButton','0','','If set to ON, a clear screen button will appear on the circulation page.','YesNo'),
115
('DisplayClearScreenButton','0','','If set to ON, a clear screen button will appear on the circulation page.','YesNo'),
(-)a/installer/data/mysql/updatedatabase.pl (+15 lines)
Lines 11095-11100 if ( CheckVersion($DBversion) ) { Link Here
11095
    SetVersion ($DBversion);
11095
    SetVersion ($DBversion);
11096
}
11096
}
11097
11097
11098
$DBversion = "3.21.00.XXX";
11099
if(CheckVersion($DBversion)) {
11100
    $dbh->do(q{
11101
        INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type )
11102
        VALUES (
11103
            'DefaultToLoggedInLibraryCircRules',  '0', NULL ,  'If enabled, circ rules editor will default to the logged in library''s rules, rather than the ''all libraries'' rules.',  'YesNo'
11104
        ), (
11105
            'DefaultToLoggedInLibraryNoticesSlips',  '0', NULL ,  'If enabled,slips and notices editor will default to the logged in library''s rules, rather than the ''all libraries'' rules.',  'YesNo'
11106
        )
11107
    });
11108
11109
    print "Upgrade to $DBversion done (Bug 11625 - Add pref DefaultToLoggedInLibraryCircRules and DefaultToLoggedInLibraryNoticesSlips)\n";
11110
    SetVersion($DBversion);
11111
}
11112
11098
# DEVELOPER PROCESS, search for anything to execute in the db_update directory
11113
# DEVELOPER PROCESS, search for anything to execute in the db_update directory
11099
# SEE bug 13068
11114
# SEE bug 13068
11100
# if there is anything in the atomicupdate, read and execute it.
11115
# if there is anything in the atomicupdate, read and execute it.
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref (-1 / +14 lines)
Lines 50-55 Administration: Link Here
50
                  yes: Allow
50
                  yes: Allow
51
                  no: "Don't allow"
51
                  no: "Don't allow"
52
            - staff and patrons to create and view saved lists of books.
52
            - staff and patrons to create and view saved lists of books.
53
        -
54
            - When editing circulation rules show the
55
            - pref: DefaultToLoggedInLibraryCircRules
56
              choices:
57
                  yes: "logged in library's"
58
                  no: "all libraries"
59
            - rules by default.
60
        -
61
            - When editing notices and slips show the 
62
            - pref: DefaultToLoggedInLibraryNoticesSlips
63
              choices:
64
                  yes: "logged in library's"
65
                  no: "all libraries"
66
            - notices and slips by default.
53
    Login options:
67
    Login options:
54
        -
68
        -
55
            - Automatically log out users after
69
            - Automatically log out users after
56
- 

Return to bug 11625