gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug_8083: parameters subpermissions: manage_circ_rules and parameters_remaining_permissions 

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Srdjan 2012-05-22 17:56:43 +12:00 committed by Paul Poulain
parent 4a4e4fd190
commit c1e5462db1
42 changed files with 69 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/admin-home.pl
View File

@ -30,7 +30,7 @@ my ($template, $loggedinuser, $cookie)
query => $query,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => '*'},
debug => 1,
});

2
admin/auth_subfields_structure.pl
View File

@ -57,7 +57,7 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user(
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => { parameters => 1 },
flagsrequired => { parameters => 'parameters_remaining_permissions' },
debug => 1,
}
);

2
admin/auth_tag_structure.pl
View File

@ -50,7 +50,7 @@ my ($template, $loggedinuser, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
admin/authorised_values.pl
View File

@ -55,7 +55,7 @@ our $dbh = C4::Context->dbh;
our ($template, $borrowernumber, $cookie)= get_template_and_user({
template_name => "admin/authorised_values.tmpl",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
query => $input,
type => "intranet",
debug => 1,

2
admin/authtypes.pl
View File

@ -45,7 +45,7 @@ my ($template, $borrowernumber, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
admin/biblio_framework.pl
View File

@ -47,7 +47,7 @@ my ($template, $borrowernumber, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
admin/branches.pl
View File

@ -63,7 +63,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => { parameters => 1},
flagsrequired => { parameters => 'parameters_remaining_permissions'},
debug => 1,
}
);

2
admin/categorie.pl
View File

@ -73,7 +73,7 @@ my ($template, $loggedinuser, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
admin/checkmarc.pl
View File

@ -34,7 +34,7 @@ my ($template, $borrowernumber, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
admin/cities.pl
View File

@ -41,7 +41,7 @@ my ($template, $loggedinuser, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
admin/classsources.pl
View File

@ -40,7 +40,7 @@ my ($template, $loggedinuser, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
admin/clone-rules.pl
View File

@ -43,7 +43,7 @@ my ($template, $loggedinuser, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
admin/currency.pl
View File

@ -57,7 +57,7 @@ our ($template, $loggedinuser, $cookie) = get_template_and_user({
template_name => 'admin/currency.tmpl',
query => $input,
type => 'intranet',
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
authnotrequired => 0,
});

2
admin/env_tz_test.pl
View File

@ -14,7 +14,7 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
query => $q,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
admin/fieldmapping.pl
View File

@ -39,7 +39,7 @@ my ($template, $loggedinuser, $cookie)
query => $query,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
admin/item_circulation_alerts.pl
View File

@ -65,7 +65,7 @@ sub show {
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => { parameters => 1 },
flagsrequired => { parameters => 'parameters_remaining_permissions' },
debug => defined($input->param('debug')),
}
);

2
admin/itemtypes.pl
View File

@ -77,7 +77,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => { parameters => 1 },
flagsrequired => { parameters => 'parameters_remaining_permissions' },
debug => 1,
}
);

2
admin/koha2marclinks.pl
View File

@ -39,7 +39,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => { parameters => 1 },
flagsrequired => { parameters => 'parameters_remaining_permissions' },
debug => 1,
}
);

2
admin/marc_subfields_structure.pl
View File

@ -72,7 +72,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => { parameters => 1 },
flagsrequired => { parameters => 'parameters_remaining_permissions' },
debug => 1,
}
);

2
admin/marctagstructure.pl
View File

@ -52,7 +52,7 @@ my ($template, $loggedinuser, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
admin/matching-rules.pl
View File

@ -39,7 +39,7 @@ my ($template, $loggedinuser, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
admin/oai_set_mappings.pl
View File

@ -45,7 +45,7 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
query => $input,
type => 'intranet',
authnotrequired => 0,
flagsrequired => { 'parameters' => '*' },
flagsrequired => { 'parameters' => 'parameters_remaining_permissions' },
debug => 1,
} );

2
admin/oai_sets.pl
View File

@ -41,7 +41,7 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
query => $input,
type => 'intranet',
authnotrequired => 0,
flagsrequired => { 'parameters' => '*' },
flagsrequired => { 'parameters' => 'parameters_remaining_permissions' },
debug => 1,
} );

2
admin/patron-attr-types.pl
View File

@ -42,7 +42,7 @@ our ($template, $loggedinuser, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
admin/preferences.pl
View File

@ -261,7 +261,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => { parameters => 1 },
flagsrequired => { parameters => 'parameters_remaining_permissions' },
debug => 1,
}
);

2
admin/printers.pl
View File

@ -72,7 +72,7 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
admin/roadtype.pl
View File

@ -43,7 +43,7 @@ my ($template, $loggedinuser, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
admin/smart-rules.pl
View File

@ -38,7 +38,7 @@ my ($template, $loggedinuser, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'manage_circ_rules'},
debug => 1,
});

2
admin/stopwords.pl
View File

@ -48,7 +48,7 @@ my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "admin/stopwords.tmpl",
query => $input,
type => "intranet",
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
authnotrequired => 0,
debug => 1,
});

2
admin/systempreferences.pl
View File

@ -592,7 +592,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => { parameters => 1 },
flagsrequired => { parameters => 'parameters_remaining_permissions' },
debug => 1,
}
);

2
admin/z3950servers.pl
View File

@ -75,7 +75,7 @@ my ($template, $loggedinuser, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {parameters => 1},
flagsrequired => {parameters => 'parameters_remaining_permissions'},
debug => 1,
});

2
installer/data/mysql/de-DE/mandatory/userpermissions.sql
View File

@ -1,6 +1,8 @@
INSERT INTO permissions (module_bit, code, description) VALUES
( 1, 'circulate_remaining_permissions', 'Übrige Ausleihberechtigungen'),
( 1, 'override_renewals', 'Gesperrte Verlängerungen überschreiben'),
( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
( 3, 'manage_circ_rules', 'manage circulation rules'),
( 6, 'place_holds', 'Vormerkungen für Benutzer setzen'),
( 6, 'modify_holds_priority', 'Vormerkungspriorität verändern'),
( 9, 'edit_catalogue', 'Katalogdaten bearbeiten (Titel- und Exemplardaten ändern)'),

2
installer/data/mysql/en/mandatory/userpermissions.sql
View File

@ -1,6 +1,8 @@
INSERT INTO permissions (module_bit, code, description) VALUES
( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
( 1, 'override_renewals', 'Override blocked renewals'),
( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
( 3, 'manage_circ_rules', 'manage circulation rules'),
( 6, 'place_holds', 'Place holds for patrons'),
( 6, 'modify_holds_priority', 'Modify holds priority'),
( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),

2
installer/data/mysql/es-ES/mandatory/userpermissions.sql
View File

@ -1,6 +1,8 @@
INSERT INTO permissions (module_bit, code, description) VALUES
( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
( 1, 'override_renewals', 'Override blocked renewals'),
( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
( 3, 'manage_circ_rules', 'manage circulation rules'),
( 6, 'place_holds', 'Place holds for patrons'),
( 6, 'modify_holds_priority', 'Modify holds priority'),
( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),

2
installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
View File

@ -1,6 +1,8 @@
INSERT INTO permissions (module_bit, code, description) VALUES
( 1, 'circulate_remaining_permissions', 'Fonctions de circulation restantes'),
( 1, 'override_renewals', 'Outrepasser les limites de renouvellement'),
( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
( 3, 'manage_circ_rules', 'manage circulation rules'),
( 6, 'place_holds', 'Réserver pour des adhérents'),
( 6, 'modify_holds_priority', 'Modifier la priorité des réservations'),
( 9, 'edit_catalogue', 'Ajouter et modifier des notices au catalogue'),

2
installer/data/mysql/it-IT/necessari/userpermissions.sql
View File

@ -3,6 +3,8 @@ SET FOREIGN_KEY_CHECKS=0;
INSERT INTO permissions (module_bit, code, description) VALUES
( 1, 'circulate_remaining_permissions', 'Permessi rimanenti per la circolazione'),
( 1, 'override_renewals', 'Sblocca i rinnovi bloccati'),
( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
( 3, 'manage_circ_rules', 'manage circulation rules'),
( 6, 'place_holds', 'Fai prenotazioni per gli utenti'),
( 6, 'modify_holds_priority', 'Modifica priorità prenotazioni'),
( 9, 'edit_catalogue', 'Cataloga (crea/modifica dati bibliografici e di copia)'),

2
installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
View File

@ -22,6 +22,8 @@
INSERT INTO permissions (module_bit, code, description) VALUES
( 1, 'circulate_remaining_permissions', 'Øvrige rettigheter for sirkulasjon'),
( 1, 'override_renewals', 'Overstyre blokkerte fornyinger'),
( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
( 3, 'manage_circ_rules', 'manage circulation rules'),
( 6, 'place_holds', 'Foreta reservering for lånere'),
( 6, 'modify_holds_priority', 'Endre rekkefølge på reserveringer'),
( 9, 'edit_catalogue', 'Endre katalogen (Endre bibliografiske poster og eksemplaropplysninger)'),

2
installer/data/mysql/pl-PL/mandatory/userpermissions.sql
View File

@ -1,6 +1,8 @@
INSERT INTO permissions (module_bit, code, description) VALUES
( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
( 1, 'override_renewals', 'Override blocked renewals'),
( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
( 3, 'manage_circ_rules', 'manage circulation rules'),
( 6, 'place_holds', 'Place holds for patrons'),
( 6, 'modify_holds_priority', 'Modify holds priority'),
( 9, 'edit_catalogue', 'Edit catalogue'),

2
installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
View File

@ -25,6 +25,8 @@ TRUNCATE permissions;
INSERT INTO permissions (module_bit, code, description) VALUES
( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
( 1, 'override_renewals', 'Override blocked renewals'),
( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
( 3, 'manage_circ_rules', 'manage circulation rules'),
( 6, 'place_holds', 'Place holds for patrons'),
( 6, 'modify_holds_priority', 'Modify holds priority'),
( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),

2
installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
View File

@ -25,6 +25,8 @@ TRUNCATE permissions;
INSERT INTO permissions (module_bit, code, description) VALUES
( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
( 1, 'override_renewals', 'Override blocked renewals'),
( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
( 3, 'manage_circ_rules', 'manage circulation rules'),
( 6, 'place_holds', 'Place holds for patrons'),
( 6, 'modify_holds_priority', 'Modify holds priority'),
( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),

18
installer/data/mysql/updatedatabase.pl
View File

@ -5536,6 +5536,24 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
SetVersion($DBversion);
}
$DBversion = "3.09.00.XXX";
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
$dbh->do("INSERT INTO permissions (module_bit, code, description) VALUES
( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
( 3, 'manage_circ_rules', 'manage circulation rules')");
$dbh->do("INSERT INTO user_permissions (borrowernumber, module_bit, code)
SELECT borrowernumber, 3, 'parameters_remaining_permissions'
FROM borrowers WHERE flags & (1 << 3)");
$dbh->do("INSERT INTO user_permissions (borrowernumber, module_bit, code)
SELECT borrowernumber, 3, 'manage_circ_rules'
FROM borrowers WHERE flags & (1 << 3)");
print "Upgrade to $DBversion done (Added parameters subpermissions)\n";
SetVersion($DBversion);
}
=head1 FUNCTIONS
=head2 TableExists($table)

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
View File

@ -49,8 +49,10 @@
<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>
<dt><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></dt>
<dd>Define extended attributes (identifiers and statistical categories) for patron records</dd>
[% IF CAN_user_parameters_manage_circ_rules %]
<dt><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></dt>
<dd>Define circulation and fines rules for combinations of libraries, patron categories, and item types</dd>
[% END %]
<dt><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></dt>
<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>
<dt><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></dt>