Merge branch '38276053_checkPermission_Overall' into 'master'

Check permission addressed on Campaigns module

See merge request !370

modules/Campaigns/actions/DetailAjax.php

@@ -15,6 +15,23 @@ class Campaigns_DetailAjax_Action extends Vtiger_BasicAjax_Action {
 		$this->exposeMethod('getRecordsCount');
 	}
 
+	public function requiresPermission(Vtiger_Request $request){
+		$mode = $request->getMode();
+		if(!empty($mode)) {
+			switch ($mode) {
+				case 'getRecordsCount':
+					$permission[] = array('module_parameter' => 'relatedModule', 'action' => 'DetailView');
+					break;
+				default:
+					break;
+			}
+		}
+		return $permission;
+	}
+	
+	public function checkPermission(Vtiger_Request $request) {
+		parent::checkPermission($request);
+	}
 	public function process(Vtiger_Request $request) {
 		$mode = $request->get('mode');
 		if(!empty($mode)) {

modules/Campaigns/actions/RelationAjax.php

@@ -16,6 +16,28 @@ class Campaigns_RelationAjax_Action extends Vtiger_RelationAjax_Action {
 		$this->exposeMethod('updateStatus');
 	}
 
+	public function requiresPermission(Vtiger_Request $request){
+		$mode = $request->getMode();
+		if(!empty($mode)) {
+			switch ($mode) {
+				case 'addRelationsFromRelatedModuleViewId':
+					$permission[] = array('module_parameter' => 'relatedModule', 'action' => 'DetailView');
+					break;
+				case 'updateStatus':
+					$permission[] = array('module_parameter' => 'relatedModule', 'action' => 'DetailView');
+					$permission[] = array('module_parameter' => 'module', 'action' => 'EditView');
+					break;
+				default:
+					break;
+			}
+		}
+		return $permission;
+	}
+	
+	public function checkPermission(Vtiger_Request $request) {
+		parent::checkPermission($request);
+	}
+	
 	/**
 	 * Function to add relations using related module viewid
 	 * @param Vtiger_Request $request

modules/Vtiger/actions/BasicAjax.php

@@ -10,10 +10,6 @@
 
 class Vtiger_BasicAjax_Action extends Vtiger_Action_Controller {
 
-	function checkPermission(Vtiger_Request $request) {
-		return;
-	}
-
 	public function process(Vtiger_Request $request) {
 		$searchValue = $request->get('search_value');
 		$searchModule = $request->get('search_module');

modules/Vtiger/views/RelatedList.php

@@ -10,14 +10,14 @@
 
 class Vtiger_RelatedList_View extends Vtiger_Index_View {
 	
-	function checkPermission(Vtiger_Request $request) {
-		$relatedModuleName = $request->get('relatedModule');
-
-		$relatedModulePermission = Users_Privileges_Model::isPermitted($relatedModuleName, 'DetailView');
-		if(!$relatedModulePermission) {
-			throw new AppException(vtranslate('LBL_PERMISSION_DENIED'));
-		}
-		return true;
+	public function requiresPermission(Vtiger_Request $request){
+		$permission[] = array('module_parameter' => 'relatedModule', 'action' => 'DetailView');
+		
+		return $permission;
+	}
+	
+	public function checkPermission(Vtiger_Request $request) {
+		parent::checkPermission($request);
 	}
 	
 	function process(Vtiger_Request $request) {