Merge pull request civicrm#11 from Edzelopez/CIVI-28

CIVI-28 Added check for permissions while search results are being displayed on contribution search, advanced search and contact summary page (Contributions tab)
Edzelopez · Mar 17, 2015 · c8c3890 · c8c3890
2 parents b37ba40 + cbbb9d3
commit c8c3890
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CRM/Financial/BAO/FinancialType.php b/CRM/Financial/BAO/FinancialType.php
@@ -207,13 +207,14 @@ public static function permissionedFinancialTypes(&$permissions) {
     $permissions['administer CiviCRM Financial Types'] = $prefix . ts('administer CiviCRM Financial Types');
   }
 
-  public static function getAvailableFinancialTypes(&$financialTypes, $action) {
+  public static function getAvailableFinancialTypes(&$financialTypes = NULL, $action = 'view') {
     $financialTypes = CRM_Contribute_PseudoConstant::financialType();
 
     foreach ($financialTypes as $finTypeId => $type) {
       if (!CRM_Core_Permission::check($action . ' contributions of type ' . $type)) {
         unset($financialTypes[$finTypeId]);
       }
     }
+    return $financialTypes;
   }
 }
diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php
@@ -153,7 +153,7 @@ public function __construct() {
           'financial_type_id' => array(
             'title' => ts('Financial Type'),
             'operatorType' => CRM_Report_Form::OP_MULTISELECT,
-            'options' => CRM_Contribute_PseudoConstant::financialType(),
+            'options' => CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes(),
             'type' => CRM_Utils_Type::T_INT,
           ),
           'contribution_page_id' => array(