added VIEW_BILLING_TYPE perm awareness

git-svn-id: svn://svn.open-ils.org/ILS/trunk@11193 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 81b666b..ebb6c6b 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -3448,7 +3448,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
         <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
             <actions>
                 <create permission="CREATE_BILLING_TYPE"/>
-                <retrieve permission="CREATE_BILLING_TYPE|UPDATE_BILLING_TYPE|DELETE_BILLING_TYPE"/>
+                <retrieve permission="VIEW_BILLING_TYPE|CREATE_BILLING_TYPE|UPDATE_BILLING_TYPE|DELETE_BILLING_TYPE"/>
                 <update permission="UPDATE_BILLING_TYPE"/>
                 <delete permission="DELETE_BILLING_TYPE"/>
             </actions>

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
index 1d888c4..93db5b5 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
@@ -91,6 +91,7 @@ sub ranged_billing_types {
     my($self, $conn, $auth, $org_id, $depth) = @_;
     my $e = new_editor(authtoken => $auth);
     return $e->event unless $e->checkauth;
+    return $e->event unless $e->allowed('VIEW_BILLING_TYPE', $org_id);
     return $e->search_config_billing_type(
         {owner => $U->get_org_full_path($org_id, $depth)});
 }