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

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 104-109 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
104
('defaultSortOrder','dsc','asc|dsc|az|za','Specify the default sort order','Choice'),
104
('defaultSortOrder','dsc','asc|dsc|az|za','Specify the default sort order','Choice'),
105
('DefaultToLoggedInLibraryCircRules',  '0', NULL ,  'If enabled, circ rules editor will default to the logged in library''s rules, rather than the ''all libraries'' rules.',  'YesNo'),
105
('DefaultToLoggedInLibraryCircRules',  '0', NULL ,  'If enabled, circ rules editor will default to the logged in library''s rules, rather than the ''all libraries'' rules.',  'YesNo'),
106
('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'),
106
('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'),
107
('DefaultToLoggedInLibraryOverdueTriggers',  '0', NULL ,  'If enabled, overdue status triggers editor will default to the logged in library''s rules, rather than the ''default'' rules.',  'YesNo'),
107
('delimiter',';',';|tabulation|,|/|\\|#||','Define the default separator character for exporting reports','Choice'),
108
('delimiter',';',';|tabulation|,|/|\\|#||','Define the default separator character for exporting reports','Choice'),
108
('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'),
109
('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'),
109
('DisplayClearScreenButton','0','','If set to ON, a clear screen button will appear on the circulation page.','YesNo'),
110
('DisplayClearScreenButton','0','','If set to ON, a clear screen button will appear on the circulation page.','YesNo'),
(-)a/installer/data/mysql/updatedatabase.pl (+11 lines)
Lines 9684-9689 if(CheckVersion($DBversion)) { Link Here
9684
    SetVersion($DBversion);
9684
    SetVersion($DBversion);
9685
}
9685
}
9686
9686
9687
$DBversion = "3.19.00.XXX";
9688
if(CheckVersion($DBversion)) {
9689
    $dbh->do(q{
9690
        INSERT INTO systempreferences ( variable, value, options, explanation, type )
9691
        VALUES ('DefaultToLoggedInLibraryOverdueTriggers',  '0', NULL ,  'If enabled, overdue status triggers editor will default to the logged in library''s rules, rather than the ''default'' rules.',  'YesNo')
9692
    });
9693
9694
    print "Upgrade to $DBversion done (Bug 13379 - Modify authorised_values.category to varchar(32))\n";
9695
    SetVersion($DBversion);
9696
}
9697
9687
=head1 FUNCTIONS
9698
=head1 FUNCTIONS
9688
9699
9689
=head2 TableExists($table)
9700
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref (+7 lines)
Lines 64-69 Administration: Link Here
64
                  yes: "logged in library's"
64
                  yes: "logged in library's"
65
                  no: "all libraries"
65
                  no: "all libraries"
66
            - notices and slips by default.
66
            - notices and slips by default.
67
        -
68
            - When editing overdue notice/status triggers show the 
69
            - pref: DefaultToLoggedInLibraryOverdueTriggers
70
              choices:
71
                  yes: "logged in library's"
72
                  no: "default"
73
            - triggers by default.
67
    Login options:
74
    Login options:
68
        -
75
        -
69
            - Automatically log out users after
76
            - Automatically log out users after
(-)a/tools/overduerules.pl (-5 / +5 lines)
Lines 61-67 sub blank_row { Link Here
61
61
62
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
62
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
63
    {
63
    {
64
        template_name   => "tools/overduerules.tmpl",
64
        template_name   => "tools/overduerules.tt",
65
        query           => $input,
65
        query           => $input,
66
        type            => "intranet",
66
        type            => "intranet",
67
        authnotrequired => 0,
67
        authnotrequired => 0,
Lines 73-81 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
73
my $type = $input->param('type');
73
my $type = $input->param('type');
74
74
75
my $branch =
75
my $branch =
76
    defined( $input->param('branch') ) ? $input->param('branch')
76
    !C4::Context->preference('DefaultToLoggedInLibraryOverdueTriggers') ? $input->param('branch')
77
  : GetBranchesCount() == 1            ? undef
77
  : defined( $input->param('branch') )                                  ? $input->param('branch')
78
  :                                      C4::Branch::mybranch();
78
  : GetBranchesCount() == 1                                             ? undef
79
  :                                                                       C4::Branch::mybranch();
79
$branch = q{} if $branch eq 'NO_LIBRARY_SET';
80
$branch = q{} if $branch eq 'NO_LIBRARY_SET';
80
$branch ||= q{};
81
$branch ||= q{};
81
82
82
- 

Return to bug 11747