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

(-)a/admin/admin-home.pl (-1 / +1 lines)
Lines 30-36 my ($template, $loggedinuser, $cookie) Link Here
30
			     query => $query,
30
			     query => $query,
31
			     type => "intranet",
31
			     type => "intranet",
32
			     authnotrequired => 0,
32
			     authnotrequired => 0,
33
			     flagsrequired => {parameters => 1},
33
			     flagsrequired => {parameters => '*'},
34
			     debug => 1,
34
			     debug => 1,
35
			     });
35
			     });
36
36
(-)a/admin/auth_subfields_structure.pl (-1 / +1 lines)
Lines 57-63 my ($template, $borrowernumber, $cookie) = get_template_and_user( Link Here
57
        query           => $input,
57
        query           => $input,
58
        type            => "intranet",
58
        type            => "intranet",
59
        authnotrequired => 0,
59
        authnotrequired => 0,
60
        flagsrequired   => { parameters => 1 },
60
        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
61
        debug           => 1,
61
        debug           => 1,
62
    }
62
    }
63
);
63
);
(-)a/admin/auth_tag_structure.pl (-1 / +1 lines)
Lines 50-56 my ($template, $loggedinuser, $cookie) Link Here
50
			     query => $input,
50
			     query => $input,
51
			     type => "intranet",
51
			     type => "intranet",
52
			     authnotrequired => 0,
52
			     authnotrequired => 0,
53
			     flagsrequired => {parameters => 1},
53
			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
54
			     debug => 1,
54
			     debug => 1,
55
			     });
55
			     });
56
56
(-)a/admin/authorised_values.pl (-1 / +1 lines)
Lines 55-61 our $dbh = C4::Context->dbh; Link Here
55
our ($template, $borrowernumber, $cookie)= get_template_and_user({
55
our ($template, $borrowernumber, $cookie)= get_template_and_user({
56
    template_name => "admin/authorised_values.tmpl",
56
    template_name => "admin/authorised_values.tmpl",
57
    authnotrequired => 0,
57
    authnotrequired => 0,
58
    flagsrequired => {parameters => 1},
58
    flagsrequired => {parameters => 'parameters_remaining_permissions'},
59
    query => $input,
59
    query => $input,
60
    type => "intranet",
60
    type => "intranet",
61
    debug => 1,
61
    debug => 1,
(-)a/admin/authtypes.pl (-1 / +1 lines)
Lines 45-51 my ($template, $borrowernumber, $cookie) Link Here
45
                query => $input,
45
                query => $input,
46
                type => "intranet",
46
                type => "intranet",
47
                authnotrequired => 0,
47
                authnotrequired => 0,
48
                flagsrequired => {parameters => 1},
48
                flagsrequired => {parameters => 'parameters_remaining_permissions'},
49
                debug => 1,
49
                debug => 1,
50
                });
50
                });
51
51
(-)a/admin/biblio_framework.pl (-1 / +1 lines)
Lines 47-53 my ($template, $borrowernumber, $cookie) Link Here
47
			     query => $input,
47
			     query => $input,
48
			     type => "intranet",
48
			     type => "intranet",
49
			     authnotrequired => 0,
49
			     authnotrequired => 0,
50
			     flagsrequired => {parameters => 1},
50
			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
51
			     debug => 1,
51
			     debug => 1,
52
			     });
52
			     });
53
53
(-)a/admin/branches.pl (-1 / +1 lines)
Lines 63-69 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
63
        query           => $input,
63
        query           => $input,
64
        type            => "intranet",
64
        type            => "intranet",
65
        authnotrequired => 0,
65
        authnotrequired => 0,
66
        flagsrequired   => { parameters => 1},
66
        flagsrequired   => { parameters => 'parameters_remaining_permissions'},
67
        debug           => 1,
67
        debug           => 1,
68
    }
68
    }
69
);
69
);
(-)a/admin/categorie.pl (-1 / +1 lines)
Lines 73-79 my ($template, $loggedinuser, $cookie) Link Here
73
			     query => $input,
73
			     query => $input,
74
			     type => "intranet",
74
			     type => "intranet",
75
			     authnotrequired => 0,
75
			     authnotrequired => 0,
76
			     flagsrequired => {parameters => 1},
76
			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
77
			     debug => 1,
77
			     debug => 1,
78
			     });
78
			     });
79
79
(-)a/admin/checkmarc.pl (-1 / +1 lines)
Lines 34-40 my ($template, $borrowernumber, $cookie) Link Here
34
			     query => $input,
34
			     query => $input,
35
			     type => "intranet",
35
			     type => "intranet",
36
			     authnotrequired => 0,
36
			     authnotrequired => 0,
37
			     flagsrequired => {parameters => 1},
37
			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
38
			     debug => 1,
38
			     debug => 1,
39
			     });
39
			     });
40
40
(-)a/admin/cities.pl (-1 / +1 lines)
Lines 41-47 my ($template, $loggedinuser, $cookie) Link Here
41
			     query => $input,
41
			     query => $input,
42
			     type => "intranet",
42
			     type => "intranet",
43
			     authnotrequired => 0,
43
			     authnotrequired => 0,
44
			     flagsrequired => {parameters => 1},
44
			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
45
			     debug => 1,
45
			     debug => 1,
46
			     });
46
			     });
47
47
(-)a/admin/classsources.pl (-1 / +1 lines)
Lines 40-46 my ($template, $loggedinuser, $cookie) Link Here
40
                 query => $input,
40
                 query => $input,
41
                 type => "intranet",
41
                 type => "intranet",
42
                 authnotrequired => 0,
42
                 authnotrequired => 0,
43
                 flagsrequired => {parameters => 1},
43
                 flagsrequired => {parameters => 'parameters_remaining_permissions'},
44
                 debug => 1,
44
                 debug => 1,
45
                 });
45
                 });
46
46
(-)a/admin/clone-rules.pl (-1 / +1 lines)
Lines 43-49 my ($template, $loggedinuser, $cookie) Link Here
43
                            query => $input,
43
                            query => $input,
44
                            type => "intranet",
44
                            type => "intranet",
45
                            authnotrequired => 0,
45
                            authnotrequired => 0,
46
                            flagsrequired => {parameters => 1},
46
                            flagsrequired => {parameters => 'parameters_remaining_permissions'},
47
                            debug => 1,
47
                            debug => 1,
48
                            });
48
                            });
49
49
(-)a/admin/currency.pl (-1 / +1 lines)
Lines 57-63 our ($template, $loggedinuser, $cookie) = get_template_and_user({ Link Here
57
    template_name => 'admin/currency.tmpl',
57
    template_name => 'admin/currency.tmpl',
58
    query => $input,
58
    query => $input,
59
    type => 'intranet',
59
    type => 'intranet',
60
    flagsrequired => {parameters => 1},
60
    flagsrequired => {parameters => 'parameters_remaining_permissions'},
61
    authnotrequired => 0,
61
    authnotrequired => 0,
62
});
62
});
63
63
(-)a/admin/env_tz_test.pl (-1 / +1 lines)
Lines 14-20 my ($template, $loggedinuser, $cookie) = get_template_and_user({ Link Here
14
			   query => $q,
14
			   query => $q,
15
			 	type => "intranet",
15
			 	type => "intranet",
16
	 authnotrequired => 0,
16
	 authnotrequired => 0,
17
 	   flagsrequired => {parameters => 1},
17
 	   flagsrequired => {parameters => 'parameters_remaining_permissions'},
18
		       debug => 1,
18
		       debug => 1,
19
});
19
});
20
20
(-)a/admin/fieldmapping.pl (-1 / +1 lines)
Lines 39-45 my ($template, $loggedinuser, $cookie) Link Here
39
			     query => $query,
39
			     query => $query,
40
			     type => "intranet",
40
			     type => "intranet",
41
			     authnotrequired => 0,
41
			     authnotrequired => 0,
42
			     flagsrequired => {parameters => 1},
42
			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
43
			     debug => 1,
43
			     debug => 1,
44
			     });
44
			     });
45
45
(-)a/admin/item_circulation_alerts.pl (-1 / +1 lines)
Lines 65-71 sub show { Link Here
65
            query           => $input,
65
            query           => $input,
66
            type            => "intranet",
66
            type            => "intranet",
67
            authnotrequired => 0,
67
            authnotrequired => 0,
68
            flagsrequired   => { parameters => 1 },
68
            flagsrequired   => { parameters => 'parameters_remaining_permissions' },
69
            debug           => defined($input->param('debug')),
69
            debug           => defined($input->param('debug')),
70
        }
70
        }
71
    );
71
    );
(-)a/admin/itemtypes.pl (-1 / +1 lines)
Lines 77-83 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
77
        query           => $input,
77
        query           => $input,
78
        type            => "intranet",
78
        type            => "intranet",
79
        authnotrequired => 0,
79
        authnotrequired => 0,
80
        flagsrequired   => { parameters => 1 },
80
        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
81
        debug           => 1,
81
        debug           => 1,
82
    }
82
    }
83
);
83
);
(-)a/admin/koha2marclinks.pl (-1 / +1 lines)
Lines 39-45 my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( Link Here
39
        query           => $input,
39
        query           => $input,
40
        type            => "intranet",
40
        type            => "intranet",
41
        authnotrequired => 0,
41
        authnotrequired => 0,
42
        flagsrequired   => { parameters => 1 },
42
        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
43
        debug           => 1,
43
        debug           => 1,
44
    }
44
    }
45
);
45
);
(-)a/admin/marc_subfields_structure.pl (-1 / +1 lines)
Lines 72-78 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
72
        query           => $input,
72
        query           => $input,
73
        type            => "intranet",
73
        type            => "intranet",
74
        authnotrequired => 0,
74
        authnotrequired => 0,
75
        flagsrequired   => { parameters => 1 },
75
        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
76
        debug           => 1,
76
        debug           => 1,
77
    }
77
    }
78
);
78
);
(-)a/admin/marctagstructure.pl (-1 / +1 lines)
Lines 52-58 my ($template, $loggedinuser, $cookie) Link Here
52
			     query => $input,
52
			     query => $input,
53
			     type => "intranet",
53
			     type => "intranet",
54
			     authnotrequired => 0,
54
			     authnotrequired => 0,
55
			     flagsrequired => {parameters => 1},
55
			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
56
			     debug => 1,
56
			     debug => 1,
57
			     });
57
			     });
58
58
(-)a/admin/matching-rules.pl (-1 / +1 lines)
Lines 39-45 my ($template, $loggedinuser, $cookie) Link Here
39
                 query => $input,
39
                 query => $input,
40
                 type => "intranet",
40
                 type => "intranet",
41
                 authnotrequired => 0,
41
                 authnotrequired => 0,
42
                 flagsrequired => {parameters => 1},
42
                 flagsrequired => {parameters => 'parameters_remaining_permissions'},
43
                 debug => 1,
43
                 debug => 1,
44
                 });
44
                 });
45
45
(-)a/admin/oai_set_mappings.pl (-1 / +1 lines)
Lines 45-51 my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( { Link Here
45
    query           => $input,
45
    query           => $input,
46
    type            => 'intranet',
46
    type            => 'intranet',
47
    authnotrequired => 0,
47
    authnotrequired => 0,
48
    flagsrequired   => { 'parameters' => '*' },
48
    flagsrequired   => { 'parameters' => 'parameters_remaining_permissions' },
49
    debug           => 1,
49
    debug           => 1,
50
} );
50
} );
51
51
(-)a/admin/oai_sets.pl (-1 / +1 lines)
Lines 41-47 my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( { Link Here
41
    query           => $input,
41
    query           => $input,
42
    type            => 'intranet',
42
    type            => 'intranet',
43
    authnotrequired => 0,
43
    authnotrequired => 0,
44
    flagsrequired   => { 'parameters' => '*' },
44
    flagsrequired   => { 'parameters' => 'parameters_remaining_permissions' },
45
    debug           => 1,
45
    debug           => 1,
46
} );
46
} );
47
47
(-)a/admin/patron-attr-types.pl (-1 / +1 lines)
Lines 42-48 our ($template, $loggedinuser, $cookie) Link Here
42
                 query => $input,
42
                 query => $input,
43
                 type => "intranet",
43
                 type => "intranet",
44
                 authnotrequired => 0,
44
                 authnotrequired => 0,
45
                 flagsrequired => {parameters => 1},
45
                 flagsrequired => {parameters => 'parameters_remaining_permissions'},
46
                 debug => 1,
46
                 debug => 1,
47
                 });
47
                 });
48
48
(-)a/admin/preferences.pl (-1 / +1 lines)
Lines 261-267 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
261
        query           => $input,
261
        query           => $input,
262
        type            => "intranet",
262
        type            => "intranet",
263
        authnotrequired => 0,
263
        authnotrequired => 0,
264
        flagsrequired   => { parameters => 1 },
264
        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
265
        debug           => 1,
265
        debug           => 1,
266
    }
266
    }
267
);
267
);
(-)a/admin/printers.pl (-1 / +1 lines)
Lines 72-78 my ($template, $loggedinuser, $cookie) = get_template_and_user({ Link Here
72
			   query => $input,
72
			   query => $input,
73
			 	type => "intranet",
73
			 	type => "intranet",
74
	 authnotrequired => 0,
74
	 authnotrequired => 0,
75
 	   flagsrequired => {parameters => 1},
75
 	   flagsrequired => {parameters => 'parameters_remaining_permissions'},
76
		       debug => 1,
76
		       debug => 1,
77
});
77
});
78
78
(-)a/admin/roadtype.pl (-1 / +1 lines)
Lines 43-49 my ($template, $loggedinuser, $cookie) Link Here
43
			     query => $input,
43
			     query => $input,
44
			     type => "intranet",
44
			     type => "intranet",
45
			     authnotrequired => 0,
45
			     authnotrequired => 0,
46
			     flagsrequired => {parameters => 1},
46
			     flagsrequired => {parameters => 'parameters_remaining_permissions'},
47
			     debug => 1,
47
			     debug => 1,
48
			     });
48
			     });
49
49
(-)a/admin/smart-rules.pl (-1 / +1 lines)
Lines 38-44 my ($template, $loggedinuser, $cookie) Link Here
38
                            query => $input,
38
                            query => $input,
39
                            type => "intranet",
39
                            type => "intranet",
40
                            authnotrequired => 0,
40
                            authnotrequired => 0,
41
                            flagsrequired => {parameters => 1},
41
                            flagsrequired => {parameters => 'manage_circ_rules'},
42
                            debug => 1,
42
                            debug => 1,
43
                            });
43
                            });
44
44
(-)a/admin/stopwords.pl (-1 / +1 lines)
Lines 48-54 my ($template, $loggedinuser, $cookie) Link Here
48
    = get_template_and_user({template_name => "admin/stopwords.tmpl",
48
    = get_template_and_user({template_name => "admin/stopwords.tmpl",
49
    query => $input,
49
    query => $input,
50
    type => "intranet",
50
    type => "intranet",
51
    flagsrequired => {parameters => 1},
51
    flagsrequired => {parameters => 'parameters_remaining_permissions'},
52
    authnotrequired => 0,
52
    authnotrequired => 0,
53
    debug => 1,
53
    debug => 1,
54
    });
54
    });
(-)a/admin/systempreferences.pl (-1 / +1 lines)
Lines 592-598 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
592
        query           => $input,
592
        query           => $input,
593
        type            => "intranet",
593
        type            => "intranet",
594
        authnotrequired => 0,
594
        authnotrequired => 0,
595
        flagsrequired   => { parameters => 1 },
595
        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
596
        debug           => 1,
596
        debug           => 1,
597
    }
597
    }
598
);
598
);
(-)a/admin/z3950servers.pl (-1 / +1 lines)
Lines 75-81 my ($template, $loggedinuser, $cookie) Link Here
75
				query => $input,
75
				query => $input,
76
				type => "intranet",
76
				type => "intranet",
77
				authnotrequired => 0,
77
				authnotrequired => 0,
78
				flagsrequired => {parameters => 1},
78
				flagsrequired => {parameters => 'parameters_remaining_permissions'},
79
				debug => 1,
79
				debug => 1,
80
				});
80
				});
81
81
(-)a/installer/data/mysql/en/mandatory/userpermissions.sql (+2 lines)
Lines 1-6 Link Here
1
INSERT INTO permissions (module_bit, code, description) VALUES
1
INSERT INTO permissions (module_bit, code, description) VALUES
2
   ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
2
   ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
3
   ( 1, 'override_renewals', 'Override blocked renewals'),
3
   ( 1, 'override_renewals', 'Override blocked renewals'),
4
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
5
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
4
   ( 6, 'place_holds', 'Place holds for patrons'),
6
   ( 6, 'place_holds', 'Place holds for patrons'),
5
   ( 6, 'modify_holds_priority', 'Modify holds priority'),
7
   ( 6, 'modify_holds_priority', 'Modify holds priority'),
6
   ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),
8
   ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),
(-)a/installer/data/mysql/updatedatabase.pl (+18 lines)
Lines 5239-5244 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
5239
    SetVersion($DBversion);
5239
    SetVersion($DBversion);
5240
}
5240
}
5241
5241
5242
5243
5244
5245
$DBversion = "3.09.00.XXX";
5246
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5247
    $dbh->do("INSERT INTO permissions (module_bit, code, description) VALUES
5248
        ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
5249
        ( 3, 'manage_circ_rules', 'manage circulation rules')");
5250
    $dbh->do("INSERT INTO user_permissions (borrowernumber, module_bit, code)
5251
        SELECT borrowernumber, 3, 'parameters_remaining_permissions'
5252
        FROM borrowers WHERE flags & (1 << 3)");
5253
    $dbh->do("INSERT INTO user_permissions (borrowernumber, module_bit, code)
5254
        SELECT borrowernumber, 3, 'manage_circ_rules'
5255
        FROM borrowers WHERE flags & (1 << 3)");
5256
    print "Upgrade to $DBversion done (Added parameters subpermissions)\n";
5257
    SetVersion($DBversion);
5258
}
5259
5242
=head1 FUNCTIONS
5260
=head1 FUNCTIONS
5243
5261
5244
=head2 TableExists($table)
5262
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (-1 / +2 lines)
Lines 49-56 Link Here
49
	<dd>Define road types (street, avenue, way, etc.). Road types display as authorized values when adding/editing patrons and can be used in geographic statistics.</dd>
49
	<dd>Define road types (street, avenue, way, etc.). Road types display as authorized values when adding/editing patrons and can be used in geographic statistics.</dd>
50
	<dt><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></dt>
50
	<dt><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></dt>
51
	<dd>Define extended attributes (identifiers and statistical categories) for patron records</dd>
51
	<dd>Define extended attributes (identifiers and statistical categories) for patron records</dd>
52
[% IF CAN_user_parameters_manage_circ_rules %]
52
	<dt><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></dt>
53
	<dt><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></dt>
53
	<dd>Define circulation and fines rules for combinations of libraries, patron categories, and item types</dd>
54
	<dd>Define circulation and fines rules for combinations of libraries, patron categories, and item types</dd>
55
[% END %]
54
    <dt><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></dt>
56
    <dt><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></dt>
55
	<dd>Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the item type involved. These rules only go into effect if the preference UseBranchTransferLimits is set to ON.</dd>
57
	<dd>Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the item type involved. These rules only go into effect if the preference UseBranchTransferLimits is set to ON.</dd>
56
    <dt><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></dt>
58
    <dt><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></dt>
57
- 

Return to bug 8083