Skip to content
Snippets Groups Projects
Commit 7e65a3f2 authored by madhu sr's avatar madhu sr
Browse files

#Fixes::158939066::madhusr::not allowed to select the between to date in the...

#Fixes::158939066::madhusr::not allowed to select the between to date in the date of birth field in the workflow condition
parent 0c4c8699
Branches
No related tags found
No related merge requests found
vendor/*
!vendor/.htaccess
.vscode/*
\ No newline at end of file
......@@ -296,7 +296,7 @@ Vtiger_Date_Field_Js('Workflows_Date_Field_Js',{},{
var dateSpecificConditions = this.get('dateSpecificConditions');
if(comparatorSelectedOptionVal.length > 0) {
if(comparatorSelectedOptionVal == 'between' || comparatorSelectedOptionVal == 'custom'){
var html = '<div class="date"><input class="dateField inputElement" style="width:auto;" data-calendar-type="range" name="'+ this.getName() +'" data-date-format="'+ this.getDateFormat() +'" type="text" ReadOnly="true" value="'+ this.getValue() + '"></div>';
var html = '<div class="date"><input class="dateField inputElement" style="width:auto;" data-calendar-type="range" name="'+ this.getName() +'" data-date-format="'+ this.getDateFormat() +'" type="text" value="'+ this.getValue() + '"></div>';
var element = jQuery(html);
return this.addValidationToElement(element);
} else if(this._specialDateComparator(comparatorSelectedOptionVal)) {
......
......@@ -237,8 +237,9 @@ class Settings_Workflows_Record_Model extends Settings_Vtiger_Record_Model {
foreach($conditions as $index => $info) {
$columnName = $info['fieldname'];
$value = $info['value'];
$value_with_escapes = str_replace("/","\\/",$value);
// To convert date value from yyyy-mm-dd format to user format
$valueArray = explode(',', $value);
$valueArray = explode(',', $value_with_escapes);
$isDateValue = false;
for($i = 0; $i < php7_count($valueArray); $i++) {
if(Vtiger_Functions::isDateValue($valueArray[$i])) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment