Skip to content
Snippets Groups Projects
Commit cb008634 authored by Apparao G's avatar Apparao G
Browse files

#Fixed: 1. Events and tasks scheduled for Saturdays are not being shown in the...

#Fixed: 1. Events and tasks scheduled for Saturdays are not being shown in the agenda list within the Calendar module. Reports save is failing if we select Assign to 
parents 46638a56 00811a69
No related branches found
No related tags found
No related merge requests found
......@@ -37,7 +37,7 @@ class Calendar_FetchAgendaEvents_Action extends Vtiger_BasicAjax_Action {
if ($hideCompleted) {
$query.= "vtiger_activity.eventstatus != 'HELD' AND ";
}
$query.= " (concat(date_start,'',time_start)) >= ? AND (concat(date_start,'',time_start)) < ?";
$query.= " (concat(date_start,' ',time_start)) >= ? AND (concat(date_start,' ',time_start)) < ?";
$params = array($dbStartDateTime, $dbEndDateTime);
......
......@@ -18,32 +18,13 @@ class Reports_Save_Action extends Vtiger_Save_Action {
public function checkPermission(Vtiger_Request $request) {
parent::checkPermission($request);
$record = $request->get('record');
if ($record) {
$reportModel = Reports_Record_Model::getCleanInstance($record);
if (!$reportModel->isEditable()) {
throw new AppException(vtranslate('LBL_PERMISSION_DENIED'));
}
}
$selectedFields = $request->get('selected_fields');
$groupbyfields = $request->get('groupbyfield');
$fieldsData = array($selectedFields, $groupbyfields);
foreach ($fieldsData as $selectedField){
foreach ($selectedField as $field) {
list($tablename, $colname, $module_field, $fieldname, $single) = explode(':', $field);
list($module, $fieldName) = explode('_', $module_field, 2);
$moduleModel = Vtiger_Module_Model::getInstance($module);
$fieldModel = Vtiger_Field_Model::getInstance($fieldname, $moduleModel);
if (($fieldModel->table !== $tablename) || ($fieldModel->column !== $colname)) {
throw new AppException(vtranslate('LBL_PERMISSION_DENIED'));
}
}
}
return true;
$modulename = $request->getModule();
$modulemodel = Reports_Module_Model::getInstance($modulename);
$currentUserPrivileges = Users_Privileges_Model::getCurrentUserPrivilegesModel();
if(!$currentUserPrivileges->hasModulePermission($modulemodel->getId())) {
throw new AppException(vtranslate('LBL_PERMISSION_DENIED'));
}
}
public function process(Vtiger_Request $request) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment