Skip to content
Snippets Groups Projects
Commit d5b72dfa authored by Prasad's avatar Prasad
Browse files

Merge branch '41024002_Record_All_fields' into 'master' 

Fixes #1144 ::Uma::field level permission is validated before emitting response

See merge request !365
parents df7fb381 d1c588d0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
modules/Calendar/actions/SaveAjax.php
+ 39
− 37
View file @ d5b72dfa
......@@ -48,44 +48,46 @@ class Calendar_SaveAjax_Action extends Vtiger_SaveAjax_Action {
$fieldModelList = $recordModel->getModule()->getFields();
$result = array();
foreach ($fieldModelList as $fieldName => $fieldModel) {
$recordFieldValue = $recordModel->get($fieldName);
if(is_array($recordFieldValue) && $fieldModel->getFieldDataType() == 'multipicklist') {
$recordFieldValue = implode(' |##| ', $recordFieldValue);
}
$fieldValue = $displayValue = Vtiger_Util_Helper::toSafeHTML($recordFieldValue);
if ($fieldModel->getFieldDataType() !== 'currency' && $fieldModel->getFieldDataType() !== 'datetime' && $fieldModel->getFieldDataType() !== 'date') {
$displayValue = $fieldModel->getDisplayValue($fieldValue, $recordModel->getId());
}
$result[$fieldName] = array();
if($fieldName == 'date_start') {
$timeStart = $recordModel->get('time_start');
$dateTimeFieldInstance = new DateTimeField($fieldValue . ' ' . $timeStart);
$fieldValue = $fieldValue.' '.$timeStart;
$userDateTimeString = $dateTimeFieldInstance->getDisplayDateTimeValue();
$dateTimeComponents = explode(' ',$userDateTimeString);
$dateComponent = $dateTimeComponents[0];
//Conveting the date format in to Y-m-d . since full calendar expects in the same format
$dataBaseDateFormatedString = DateTimeField::__convertToDBFormat($dateComponent, $user->get('date_format'));
$result[$fieldName]['calendar_display_value'] = $dataBaseDateFormatedString.' '. $dateTimeComponents[1];
$displayValue = $fieldModel->getDisplayValue($fieldValue);
} else if($fieldName == 'due_date') {
$timeEnd = $recordModel->get('time_end');
$dateTimeFieldInstance = new DateTimeField($fieldValue . ' ' . $timeEnd);
$fieldValue = $fieldValue.' '.$timeEnd;
$userDateTimeString = $dateTimeFieldInstance->getDisplayDateTimeValue();
$dateTimeComponents = explode(' ',$userDateTimeString);
$dateComponent = $dateTimeComponents[0];
//Conveting the date format in to Y-m-d . since full calendar expects in the same format
$dataBaseDateFormatedString = DateTimeField::__convertToDBFormat($dateComponent, $user->get('date_format'));
$result[$fieldName]['calendar_display_value'] = $dataBaseDateFormatedString.' '. $dateTimeComponents[1];
$displayValue = $fieldModel->getDisplayValue($fieldValue);
if($fieldModel->isViewable()){
$recordFieldValue = $recordModel->get($fieldName);
if(is_array($recordFieldValue) && $fieldModel->getFieldDataType() == 'multipicklist') {
$recordFieldValue = implode(' |##| ', $recordFieldValue);
}
$fieldValue = $displayValue = Vtiger_Util_Helper::toSafeHTML($recordFieldValue);
if ($fieldModel->getFieldDataType() !== 'currency' && $fieldModel->getFieldDataType() !== 'datetime' && $fieldModel->getFieldDataType() !== 'date') {
$displayValue = $fieldModel->getDisplayValue($fieldValue, $recordModel->getId());
}
$result[$fieldName] = array();
if($fieldName == 'date_start') {
$timeStart = $recordModel->get('time_start');
$dateTimeFieldInstance = new DateTimeField($fieldValue . ' ' . $timeStart);
$fieldValue = $fieldValue.' '.$timeStart;
$userDateTimeString = $dateTimeFieldInstance->getDisplayDateTimeValue();
$dateTimeComponents = explode(' ',$userDateTimeString);
$dateComponent = $dateTimeComponents[0];
//Conveting the date format in to Y-m-d . since full calendar expects in the same format
$dataBaseDateFormatedString = DateTimeField::__convertToDBFormat($dateComponent, $user->get('date_format'));
$result[$fieldName]['calendar_display_value'] = $dataBaseDateFormatedString.' '. $dateTimeComponents[1];
$displayValue = $fieldModel->getDisplayValue($fieldValue);
} else if($fieldName == 'due_date') {
$timeEnd = $recordModel->get('time_end');
$dateTimeFieldInstance = new DateTimeField($fieldValue . ' ' . $timeEnd);
$fieldValue = $fieldValue.' '.$timeEnd;
$userDateTimeString = $dateTimeFieldInstance->getDisplayDateTimeValue();
$dateTimeComponents = explode(' ',$userDateTimeString);
$dateComponent = $dateTimeComponents[0];
//Conveting the date format in to Y-m-d . since full calendar expects in the same format
$dataBaseDateFormatedString = DateTimeField::__convertToDBFormat($dateComponent, $user->get('date_format'));
$result[$fieldName]['calendar_display_value'] = $dataBaseDateFormatedString.' '. $dateTimeComponents[1];
$displayValue = $fieldModel->getDisplayValue($fieldValue);
}
$result[$fieldName]['value'] = $fieldValue;
$result[$fieldName]['display_value'] = decode_html($displayValue);
}
$result[$fieldName]['value'] = $fieldValue;
$result[$fieldName]['display_value'] = decode_html($displayValue);
}
$result['_recordLabel'] = $recordModel->getName();
......
modules/Events/actions/SaveAjax.php
+ 39
− 37
View file @ d5b72dfa
......@@ -45,44 +45,46 @@ class Events_SaveAjax_Action extends Events_Save_Action {
$fieldModelList = $recordModel->getModule()->getFields();
$result = array();
foreach ($fieldModelList as $fieldName => $fieldModel) {
$recordFieldValue = $recordModel->get($fieldName);
if (is_array($recordFieldValue) && $fieldModel->getFieldDataType() == 'multipicklist') {
$recordFieldValue = implode(' |##| ', $recordFieldValue);
}
$fieldValue = $displayValue = Vtiger_Util_Helper::toSafeHTML($recordFieldValue);
if ($fieldModel->getFieldDataType() !== 'currency' && $fieldModel->getFieldDataType() !== 'datetime' && $fieldModel->getFieldDataType() !== 'date') {
$displayValue = $fieldModel->getDisplayValue($fieldValue, $recordModel->getId());
}
$result[$fieldName] = array();
if ($fieldName == 'date_start') {
$timeStart = $recordModel->get('time_start');
$dateTimeFieldInstance = new DateTimeField($fieldValue . ' ' . $timeStart);
$fieldValue = $fieldValue . ' ' . $timeStart;
$userDateTimeString = $dateTimeFieldInstance->getDisplayDateTimeValue();
$dateTimeComponents = explode(' ', $userDateTimeString);
$dateComponent = $dateTimeComponents[0];
//Conveting the date format in to Y-m-d . since full calendar expects in the same format
$dataBaseDateFormatedString = DateTimeField::__convertToDBFormat($dateComponent, $user->get('date_format'));
$result[$fieldName]['calendar_display_value'] = $dataBaseDateFormatedString . ' ' . $dateTimeComponents[1];
$displayValue = $fieldModel->getDisplayValue($fieldValue);
} else if ($fieldName == 'due_date') {
$timeEnd = $recordModel->get('time_end');
$dateTimeFieldInstance = new DateTimeField($fieldValue . ' ' . $timeEnd);
$fieldValue = $fieldValue . ' ' . $timeEnd;
$userDateTimeString = $dateTimeFieldInstance->getDisplayDateTimeValue();
$dateTimeComponents = explode(' ', $userDateTimeString);
$dateComponent = $dateTimeComponents[0];
//Conveting the date format in to Y-m-d . since full calendar expects in the same format
$dataBaseDateFormatedString = DateTimeField::__convertToDBFormat($dateComponent, $user->get('date_format'));
$result[$fieldName]['calendar_display_value'] = $dataBaseDateFormatedString . ' ' . $dateTimeComponents[1];
$displayValue = $fieldModel->getDisplayValue($fieldValue);
if($fieldModel->isViewable()){
$recordFieldValue = $recordModel->get($fieldName);
if (is_array($recordFieldValue) && $fieldModel->getFieldDataType() == 'multipicklist') {
$recordFieldValue = implode(' |##| ', $recordFieldValue);
}
$fieldValue = $displayValue = Vtiger_Util_Helper::toSafeHTML($recordFieldValue);
if ($fieldModel->getFieldDataType() !== 'currency' && $fieldModel->getFieldDataType() !== 'datetime' && $fieldModel->getFieldDataType() !== 'date') {
$displayValue = $fieldModel->getDisplayValue($fieldValue, $recordModel->getId());
}
$result[$fieldName] = array();
if ($fieldName == 'date_start') {
$timeStart = $recordModel->get('time_start');
$dateTimeFieldInstance = new DateTimeField($fieldValue . ' ' . $timeStart);
$fieldValue = $fieldValue . ' ' . $timeStart;
$userDateTimeString = $dateTimeFieldInstance->getDisplayDateTimeValue();
$dateTimeComponents = explode(' ', $userDateTimeString);
$dateComponent = $dateTimeComponents[0];
//Conveting the date format in to Y-m-d . since full calendar expects in the same format
$dataBaseDateFormatedString = DateTimeField::__convertToDBFormat($dateComponent, $user->get('date_format'));
$result[$fieldName]['calendar_display_value'] = $dataBaseDateFormatedString . ' ' . $dateTimeComponents[1];
$displayValue = $fieldModel->getDisplayValue($fieldValue);
} else if ($fieldName == 'due_date') {
$timeEnd = $recordModel->get('time_end');
$dateTimeFieldInstance = new DateTimeField($fieldValue . ' ' . $timeEnd);
$fieldValue = $fieldValue . ' ' . $timeEnd;
$userDateTimeString = $dateTimeFieldInstance->getDisplayDateTimeValue();
$dateTimeComponents = explode(' ', $userDateTimeString);
$dateComponent = $dateTimeComponents[0];
//Conveting the date format in to Y-m-d . since full calendar expects in the same format
$dataBaseDateFormatedString = DateTimeField::__convertToDBFormat($dateComponent, $user->get('date_format'));
$result[$fieldName]['calendar_display_value'] = $dataBaseDateFormatedString . ' ' . $dateTimeComponents[1];
$displayValue = $fieldModel->getDisplayValue($fieldValue);
}
$result[$fieldName]['value'] = $fieldValue;
$result[$fieldName]['display_value'] = decode_html($displayValue);
}
$result[$fieldName]['value'] = $fieldValue;
$result[$fieldName]['display_value'] = decode_html($displayValue);
}
$result['_recordLabel'] = $recordModel->getName();
......
modules/Products/actions/SaveAjax.php
+ 22
− 20
View file @ d5b72dfa
......@@ -22,27 +22,29 @@ class Products_SaveAjax_Action extends Vtiger_SaveAjax_Action {
$result = array();
$picklistColorMap = array();
foreach ($fieldModelList as $fieldName => $fieldModel) {
$recordFieldValue = $recordModel->get($fieldName);
if (is_array($recordFieldValue) && $fieldModel->getFieldDataType() == 'multipicklist') {
foreach ($recordFieldValue as $picklistValue) {
$picklistColorMap[$picklistValue] = Settings_Picklist_Module_Model::getPicklistColorByValue($fieldName, $picklistValue);
if($fieldModel->isViewable()){
$recordFieldValue = $recordModel->get($fieldName);
if (is_array($recordFieldValue) && $fieldModel->getFieldDataType() == 'multipicklist') {
foreach ($recordFieldValue as $picklistValue) {
$picklistColorMap[$picklistValue] = Settings_Picklist_Module_Model::getPicklistColorByValue($fieldName, $picklistValue);
}
$recordFieldValue = implode(' |##| ', $recordFieldValue);
}
if ($fieldModel->getFieldDataType() == 'picklist') {
$picklistColorMap[$recordFieldValue] = Settings_Picklist_Module_Model::getPicklistColorByValue($fieldName, $recordFieldValue);
}
$fieldValue = $displayValue = Vtiger_Util_Helper::toSafeHTML($recordFieldValue);
if ($fieldName !== 'unit_price' && $fieldModel->getFieldDataType() !== 'datetime' && $fieldModel->getFieldDataType() !== 'double') {
$displayValue = $fieldModel->getDisplayValue($fieldValue, $recordModel->getId());
}
if ($fieldModel->getFieldDataType() == 'reference') {
$displayValue = $fieldModel->getEditViewDisplayValue($fieldValue);
}
if (!empty($picklistColorMap)) {
$result[$fieldName] = array('value' => $fieldValue, 'display_value' => $displayValue, 'colormap' => $picklistColorMap);
} else {
$result[$fieldName] = array('value' => $fieldValue, 'display_value' => $displayValue);
}
$recordFieldValue = implode(' |##| ', $recordFieldValue);
}
if ($fieldModel->getFieldDataType() == 'picklist') {
$picklistColorMap[$recordFieldValue] = Settings_Picklist_Module_Model::getPicklistColorByValue($fieldName, $recordFieldValue);
}
$fieldValue = $displayValue = Vtiger_Util_Helper::toSafeHTML($recordFieldValue);
if ($fieldName !== 'unit_price' && $fieldModel->getFieldDataType() !== 'datetime' && $fieldModel->getFieldDataType() !== 'double') {
$displayValue = $fieldModel->getDisplayValue($fieldValue, $recordModel->getId());
}
if ($fieldModel->getFieldDataType() == 'reference') {
$displayValue = $fieldModel->getEditViewDisplayValue($fieldValue);
}
if (!empty($picklistColorMap)) {
$result[$fieldName] = array('value' => $fieldValue, 'display_value' => $displayValue, 'colormap' => $picklistColorMap);
} else {
$result[$fieldName] = array('value' => $fieldValue, 'display_value' => $displayValue);
}
}
......
modules/Users/actions/SaveAjax.php
+ 12
− 10
View file @ d5b72dfa
......@@ -50,17 +50,19 @@ class Users_SaveAjax_Action extends Vtiger_SaveAjax_Action {
$fieldModelList = $recordModel->getModule()->getFields();
$result = array();
foreach ($fieldModelList as $fieldName => $fieldModel) {
$fieldValue = $displayValue = Vtiger_Util_Helper::toSafeHTML($recordModel->get($fieldName));
if ($fieldModel->getFieldDataType() !== 'currency') {
$displayValue = $fieldModel->getDisplayValue($fieldValue, $recordModel->getId());
if($fieldModel->isViewable()){
$fieldValue = $displayValue = Vtiger_Util_Helper::toSafeHTML($recordModel->get($fieldName));
if ($fieldModel->getFieldDataType() !== 'currency') {
$displayValue = $fieldModel->getDisplayValue($fieldValue, $recordModel->getId());
}
if($fieldName == 'language') {
$displayValue = Vtiger_Language_Handler::getLanguageLabel($fieldValue);
}
if(($fieldName == 'currency_decimal_separator' || $fieldName == 'currency_grouping_separator') && ($displayValue == ' ')) {
$displayValue = vtranslate('Space', 'Users');
}
$result[$fieldName] = array('value' => $fieldValue, 'display_value' => $displayValue);
}
if($fieldName == 'language') {
$displayValue = Vtiger_Language_Handler::getLanguageLabel($fieldValue);
}
if(($fieldName == 'currency_decimal_separator' || $fieldName == 'currency_grouping_separator') && ($displayValue == ' ')) {
$displayValue = vtranslate('Space', 'Users');
}
$result[$fieldName] = array('value' => $fieldValue, 'display_value' => $displayValue);
}
$result['_recordLabel'] = $recordModel->getName();
......
modules/Vtiger/actions/SaveAjax.php
+ 22
− 20
View file @ d5b72dfa
......@@ -22,27 +22,29 @@ class Vtiger_SaveAjax_Action extends Vtiger_Save_Action {
$result = array();
$picklistColorMap = array();
foreach ($fieldModelList as $fieldName => $fieldModel) {
$recordFieldValue = $recordModel->get($fieldName);
if(is_array($recordFieldValue) && $fieldModel->getFieldDataType() == 'multipicklist') {
foreach ($recordFieldValue as $picklistValue) {
$picklistColorMap[$picklistValue] = Settings_Picklist_Module_Model::getPicklistColorByValue($fieldName, $picklistValue);
if($fieldModel->isViewable()){
$recordFieldValue = $recordModel->get($fieldName);
if(is_array($recordFieldValue) && $fieldModel->getFieldDataType() == 'multipicklist') {
foreach ($recordFieldValue as $picklistValue) {
$picklistColorMap[$picklistValue] = Settings_Picklist_Module_Model::getPicklistColorByValue($fieldName, $picklistValue);
}
$recordFieldValue = implode(' |##| ', $recordFieldValue);
}
if($fieldModel->getFieldDataType() == 'picklist') {
$picklistColorMap[$recordFieldValue] = Settings_Picklist_Module_Model::getPicklistColorByValue($fieldName, $recordFieldValue);
}
$fieldValue = $displayValue = Vtiger_Util_Helper::toSafeHTML($recordFieldValue);
if ($fieldModel->getFieldDataType() !== 'currency' && $fieldModel->getFieldDataType() !== 'datetime' && $fieldModel->getFieldDataType() !== 'date' && $fieldModel->getFieldDataType() !== 'double') {
$displayValue = $fieldModel->getDisplayValue($fieldValue, $recordModel->getId());
}
if ($fieldModel->getFieldDataType() == 'currency') {
$displayValue = Vtiger_Currency_UIType::transformDisplayValue($fieldValue);
}
if(!empty($picklistColorMap)) {
$result[$fieldName] = array('value' => $fieldValue, 'display_value' => $displayValue, 'colormap' => $picklistColorMap);
} else {
$result[$fieldName] = array('value' => $fieldValue, 'display_value' => $displayValue);
}
$recordFieldValue = implode(' |##| ', $recordFieldValue);
}
if($fieldModel->getFieldDataType() == 'picklist') {
$picklistColorMap[$recordFieldValue] = Settings_Picklist_Module_Model::getPicklistColorByValue($fieldName, $recordFieldValue);
}
$fieldValue = $displayValue = Vtiger_Util_Helper::toSafeHTML($recordFieldValue);
if ($fieldModel->getFieldDataType() !== 'currency' && $fieldModel->getFieldDataType() !== 'datetime' && $fieldModel->getFieldDataType() !== 'date' && $fieldModel->getFieldDataType() !== 'double') {
$displayValue = $fieldModel->getDisplayValue($fieldValue, $recordModel->getId());
}
if ($fieldModel->getFieldDataType() == 'currency') {
$displayValue = Vtiger_Currency_UIType::transformDisplayValue($fieldValue);
}
if(!empty($picklistColorMap)) {
$result[$fieldName] = array('value' => $fieldValue, 'display_value' => $displayValue, 'colormap' => $picklistColorMap);
} else {
$result[$fieldName] = array('value' => $fieldValue, 'display_value' => $displayValue);
}
}
......
pkg/vtiger/modules/ModComments/modules/ModComments/actions/SaveAjax.php
+ 4
− 2
View file @ d5b72dfa
......@@ -30,8 +30,10 @@ class ModComments_SaveAjax_Action extends Vtiger_SaveAjax_Action {
$fieldModelList = $recordModel->getModule()->getFields();
$result = array();
foreach ($fieldModelList as $fieldName => $fieldModel) {
$fieldValue = $recordModel->get($fieldName);
$result[$fieldName] = array('value' => $fieldValue, 'display_value' => $fieldModel->getDisplayValue($fieldValue));
if($fieldModel->isViewable()){
$fieldValue = $recordModel->get($fieldName);
$result[$fieldName] = array('value' => $fieldValue, 'display_value' => $fieldModel->getDisplayValue($fieldValue));
}
}
$result['id'] = $result['_recordId'] = $recordModel->getId();
$result['_recordLabel'] = $recordModel->getName();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright 2023 Vtiger. All rights reserved.