@@ -, +, @@
perm
---
installer/data/mysql/userflags.sql | 3 ++-
installer/data/mysql/userpermissions.sql | 2 +-
koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc | 5 ++++-
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +-
members/purchase-suggestions.pl | 2 +-
suggestion/suggestion.pl | 2 +-
9 files changed, 13 insertions(+), 9 deletions(-)
--- a/installer/data/mysql/userflags.sql
+++ a/installer/data/mysql/userflags.sql
@@ -8,7 +8,8 @@ INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES
(6,'reserveforothers','Place and modify holds for patrons',0),
(9,'editcatalogue','Edit catalog (Modify bibliographic/holdings data)',0),
(10,'updatecharges','Manage patrons fines and fees',0),
-(11,'acquisition','Acquisition and/or suggestion management',0),
+(11,'acquisition','Acquisition management',0),
+(12,'suggestions','Suggestion management',0),
(13,'tools','Use all tools (expand for granular tools permissions)',0),
(14,'editauthorities','Edit authorities',0),
(15,'serials','Manage serial subscriptions',0),
--- a/installer/data/mysql/userpermissions.sql
+++ a/installer/data/mysql/userpermissions.sql
@@ -48,7 +48,6 @@ INSERT INTO permissions (module_bit, code, description) VALUES
(10, 'writeoff', 'Write off fines and fees'),
(10, 'remaining_permissions', 'Remaining permissions for managing fines and fees'),
(11, 'currencies_manage', 'Manage currencies and exchange rates'),
- (11, 'suggestions_manage', 'Manage purchase suggestions'),
(11, 'vendors_manage', 'Manage vendors'),
(11, 'contracts_manage', 'Manage contracts'),
(11, 'period_manage', 'Manage budgets'),
@@ -62,6 +61,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
(11, 'budget_add_del', 'Add and delete funds (but can''t modify funds)'),
(11, 'budget_manage_all', 'Manage all funds'),
(11, 'edi_manage', 'Manage EDIFACT transmissions'),
+ (12, 'suggestions_manage', 'Manage purchase suggestions'),
(13, 'edit_news', 'Write news for the OPAC and staff interfaces'),
(13, 'label_creator', 'Create printable labels and barcodes from catalog and patron data'),
(13, 'edit_calendar', 'Define days when the library is closed'),
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -4,7 +4,7 @@
- Acquisitions home
[% IF ( CAN_user_acquisition_order_receive ) %]- Late orders
[% END %]
- [% IF ( suggestion && CAN_user_acquisition_suggestions_manage ) %]- Suggestions
[% END %]
+ [% IF ( suggestion && CAN_user_suggestions_suggestions_manage ) %]- Suggestions
[% END %]
- Invoices
[% IF CAN_user_acquisition_edi_manage %]
- EDIFACT messages
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -122,7 +122,7 @@
[% END %]
[% END %]
- [% IF CAN_user_acquisition_suggestions_manage %]
+ [% IF CAN_user_suggestions_suggestions_manage %]
[% IF ( suggestionsview ) %]- [% ELSE %]
- [% END %]Purchase suggestions
[% END %]
[% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
@@ -28,7 +28,10 @@
Manage patrons fines and fees
([% name | html %])
[%- CASE 'acquisition' -%]
- Acquisition and/or suggestion management
+ Acquisition management
+ ([% name | html %])
+ [%- CASE 'suggestions' -%]
+ Suggestions management
([% name | html %])
[%- CASE 'tools' -%]
Use all tools (expand for granular tools permissions)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
@@ -49,7 +49,7 @@
-[% IF ( CAN_user_acquisition_suggestions_manage && suggestion && suggestions_count ) %]
+[% IF ( CAN_user_suggestions_suggestions_manage && suggestion && suggestions_count ) %]
[% END %]
- [% IF ( CAN_user_acquisition_suggestions_manage && pendingsuggestions ) %]
+ [% IF ( CAN_user_suggestions_suggestions_manage && pendingsuggestions ) %]
Suggestions pending approval:
--- a/members/purchase-suggestions.pl
+++ a/members/purchase-suggestions.pl
@@ -34,7 +34,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { acquisition => 'suggestions_manage' },
+ flagsrequired => { suggestions => 'suggestions_manage' },
debug => 1,
}
);
--- a/suggestion/suggestion.pl
+++ a/suggestion/suggestion.pl
@@ -112,7 +112,7 @@ my ( $template, $borrowernumber, $cookie, $userflags ) = get_template_and_user(
template_name => "suggestion/suggestion.tt",
query => $input,
type => "intranet",
- flagsrequired => { acquisition => 'suggestions_manage' },
+ flagsrequired => { suggestions => 'suggestions_manage' },
}
);
--