diff --git a/layouts/vlayout/modules/Vtiger/resources/List.js b/layouts/vlayout/modules/Vtiger/resources/List.js index 751d29c6..eaf2c78b 100644 --- a/layouts/vlayout/modules/Vtiger/resources/List.js +++ b/layouts/vlayout/modules/Vtiger/resources/List.js @@ -512,6 +512,7 @@ jQuery.Class("Vtiger_List_Js",{ var postData = { "module": module, "action": "DeleteAjax", + "operation": "deleteevent", "record": recordId, "parent": app.getParentModuleName() } @@ -527,7 +528,7 @@ jQuery.Class("Vtiger_List_Js",{ function(data){ progressIndicatorElement.progressIndicator({ 'mode' : 'hide' - }) + }); if(data.success) { var orderBy = jQuery('#orderBy').val(); var sortOrder = jQuery("#sortOrder").val(); diff --git a/modules/Vtiger/actions/DeleteAjax.php b/modules/Vtiger/actions/DeleteAjax.php index d9e36381..cdb1ee2f 100644 --- a/modules/Vtiger/actions/DeleteAjax.php +++ b/modules/Vtiger/actions/DeleteAjax.php @@ -25,7 +25,8 @@ public function process(Vtiger_Request $request) { $response->emit(); exit; - }else if($operation == "deleteevent"){ + } + /*else if($operation == "deleteevent" ){ $recordModel = Vtiger_Record_Model::getInstanceById($recordId, $moduleName); $recordModel->delete(); @@ -36,7 +37,8 @@ public function process(Vtiger_Request $request) { $response->emit(); exit; - }else if($operation == "deleteManyEvents"){ + }*/ + else if($operation == "deleteManyEvents"){ $idsReferencesArray = $request->get('idsReferencesArray'); for($a = 0; $a < count($idsReferencesArray) ; $a++){ @@ -52,8 +54,17 @@ public function process(Vtiger_Request $request) { $response->emit(); exit; - }else{ - // it cannot step here, $operation must be given in request. error. + } + else{ + //// it cannot step here, $operation must be given in request. error. + //// but because it are often not writen in request, we need to have a way to delete it anyway. + $recordModel = Vtiger_Record_Model::getInstanceById($recordId, $moduleName); + $recordModel->delete(); + + $cvId = $request->get('viewname'); + $response = new Vtiger_Response(); + $response->setResult(array('viewname'=>$cvId, 'module'=>$moduleName)); + $response->emit(); exit; } }