From fe97bf3ed99b3b87fda87b31889f3ef55f805dc5 Mon Sep 17 00:00:00 2001 From: Thomas Berezansky Date: Thu, 19 Apr 2012 00:46:25 -0400 Subject: [PATCH] Add VIEW_CASH_REPORTS perm Because some groups would like to limit that interface more significantly. Signed-off-by: Thomas Berezansky --- Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Money.pm | 4 ++-- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 10 +++++++--- Open-ILS/src/sql/Pg/upgrade/XXXX.cash_reports_perm.sql | 3 +++ Open-ILS/xul/staff_client/server/admin/cash_reports.js | 4 ++-- 4 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.cash_reports_perm.sql diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Money.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Money.pm index b8cc5730b3..de962e2b05 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Money.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Money.pm @@ -899,7 +899,7 @@ sub desk_payments { my( $self, $conn, $auth, $org, $start_date, $end_date ) = @_; my $e = new_editor(authtoken=>$auth); return $e->event unless $e->checkauth; - return $e->event unless $e->allowed('VIEW_TRANSACTION', $org); + return $e->event unless $e->allowed('VIEW_CASH_REPORTS', $org); my $data = $U->storagereq( 'open-ils.storage.money.org_unit.desk_payments.atomic', $org, $start_date, $end_date ); @@ -918,7 +918,7 @@ sub user_payments { my( $self, $conn, $auth, $org, $start_date, $end_date ) = @_; my $e = new_editor(authtoken=>$auth); return $e->event unless $e->checkauth; - return $e->event unless $e->allowed('VIEW_TRANSACTION', $org); + return $e->event unless $e->allowed('VIEW_CASH_REPORTS', $org); my $data = $U->storagereq( 'open-ils.storage.money.org_unit.user_payments.atomic', $org, $start_date, $end_date ); diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql index d53ae14db5..b4c3c54891 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -1543,7 +1543,9 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES ( 526, 'UPDATE_PATRON_STAT_CAT_ENTRY_DEFAULT', oils_i18n_gettext( 526, 'User may reset a default entry in a patron statistical category', 'ppl', 'description' )), ( 527, 'DELETE_PATRON_STAT_CAT_ENTRY_DEFAULT', oils_i18n_gettext( 527, - 'User may unset a default entry in a patron statistical category', 'ppl', 'description' )); + 'User may unset a default entry in a patron statistical category', 'ppl', 'description' )), + ( 528, 'VIEW_CASH_REPORTS', oils_i18n_gettext( 528, + 'User may view data via the cash reports interface', 'ppl', 'description' )); SELECT SETVAL('permission.perm_list_id_seq'::TEXT, 1000); @@ -1644,7 +1646,8 @@ INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) 'VIEW_USER_FINES_SUMMARY', 'VIEW_USER_TRANSACTIONS', 'VIEW_VOLUME_NOTES', - 'VIEW_ZIP_DATA'); + 'VIEW_ZIP_DATA', + 'VIEW_CASH_REPORTS'); INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT @@ -2110,7 +2113,8 @@ INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) 'VIEW_STANDING_PENALTY', 'VOID_BILLING', 'TRANSIT_CHECKIN_INTERVAL_BLOCK.override', - 'VOLUME_HOLDS'); + 'VOLUME_HOLDS', + 'VIEW_CASH_REPORTS'); -- Add basic sys admin permissions to the Local Administrator group diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.cash_reports_perm.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.cash_reports_perm.sql new file mode 100644 index 0000000000..dbf34a96dd --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.cash_reports_perm.sql @@ -0,0 +1,3 @@ +INSERT INTO permission.perm_list (code, description) VALUES +('VIEW_CASH_REPORTS', 'User may view data via the cash reports interface'); + diff --git a/Open-ILS/xul/staff_client/server/admin/cash_reports.js b/Open-ILS/xul/staff_client/server/admin/cash_reports.js index c55431d1ca..89a230215f 100644 --- a/Open-ILS/xul/staff_client/server/admin/cash_reports.js +++ b/Open-ILS/xul/staff_client/server/admin/cash_reports.js @@ -1,7 +1,7 @@ var FETCH_DESK_PAYMENTS = 'open-ils.circ:open-ils.circ.money.org_unit.desk_payments'; var FETCH_USER_PAYMENTS = 'open-ils.circ:open-ils.circ.money.org_unit.user_payments'; -var myPerms = [ 'VIEW_TRANSACTION' ]; +var myPerms = [ 'VIEW_CASH_REPORTS' ]; var crBaseOrg; function crInit() { @@ -55,7 +55,7 @@ function crCurrentOrg() { function crBuildOrgs() { - var org = findOrgUnit(PERMS['VIEW_TRANSACTION']); + var org = findOrgUnit(PERMS['VIEW_CASH_REPORTS']); if(!org) { $('cr_orgs').disabled = true; -- 2.11.0