[open-ils-commits] r11193 - in trunk/Open-ILS: examples src/perlmods/OpenILS/Application

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-11-14 15:04:56 -0500 (Fri, 14 Nov 2008)
New Revision: 11193

Modified:
   trunk/Open-ILS/examples/fm_IDL.xml
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
Log:
added VIEW_BILLING_TYPE perm awareness

Modified: trunk/Open-ILS/examples/fm_IDL.xml
===================================================================
--- trunk/Open-ILS/examples/fm_IDL.xml	2008-11-14 20:02:48 UTC (rev 11192)
+++ trunk/Open-ILS/examples/fm_IDL.xml	2008-11-14 20:04:56 UTC (rev 11193)
@@ -3448,7 +3448,7 @@
         <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>

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm	2008-11-14 20:02:48 UTC (rev 11192)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm	2008-11-14 20:04:56 UTC (rev 11193)
@@ -91,6 +91,7 @@
     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)});
 }