From 3d3926674d946eb442486fd679dc90712365d9cc Mon Sep 17 00:00:00 2001
From: Madhu S R <madhu.sr@vtigersolutions.com>
Date: Sun, 21 Apr 2024 07:28:42 +0530
Subject: [PATCH] The time_start field value added to task list view to handle
the quick edit
---
modules/Calendar/models/Module.php | 4 +++-
modules/Vtiger/models/Module.php | 7 +++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/modules/Calendar/models/Module.php b/modules/Calendar/models/Module.php
index ee022afb6..9f34793c1 100644
--- a/modules/Calendar/models/Module.php
+++ b/modules/Calendar/models/Module.php
@@ -763,6 +763,7 @@ class Calendar_Module_Model extends Vtiger_Module_Model {
public function getAllTasksbyPriority($conditions = false, $pagingModel) {
global $current_user;
+ $currentUserModel = Users_Record_Model::getCurrentUserModel();
$db = PearDatabase::getInstance();
$queryGenerator = new QueryGenerator("Calendar",$current_user);
@@ -815,9 +816,10 @@ class Calendar_Module_Model extends Vtiger_Module_Model {
case "datetime": $value = Vtiger_Date_UIType::getDisplayDateValue($value);
break;
+ // Assigning the time value to the basic info, which we use for the quick edit of tasks ex: start time.
case "time": $value = Vtiger_Time_UIType::getDisplayTimeValue($value);
$value = $fieldModel->getDisplayValue($value);
- $hourFormat = $userModel->get('hour_format');
+ $hourFormat = $currentUserModel->get('hour_format');
if($hourFormat == '24') {
$value= date('H:i', strtotime($value));
}
diff --git a/modules/Vtiger/models/Module.php b/modules/Vtiger/models/Module.php
index 0c27795ca..0c578baf6 100644
--- a/modules/Vtiger/models/Module.php
+++ b/modules/Vtiger/models/Module.php
@@ -472,13 +472,12 @@ class Vtiger_Module_Model extends Vtiger_Module {
foreach($blocksList as $blockName => $blockModel) {
$fieldList = $blockModel->getFields();
foreach($fieldList as $fieldName => $fieldModel) {
+ // The "time_start" field has been included in the quick create field list because we utilize its data value for quick editing purpose
if ($fieldName == 'time_start' && $blockModel->get('id') == 19){
$quickCreateFieldList[$fieldName] = $fieldModel;
}
- else {
- if($fieldModel->isQuickCreateEnabled() && $fieldModel->isEditable()) {
- $quickCreateFieldList[$fieldName] = $fieldModel;
- }
+ else if($fieldModel->isQuickCreateEnabled() && $fieldModel->isEditable()){
+ $quickCreateFieldList[$fieldName] = $fieldModel;
}
}
}
--
GitLab