Commit ecc4e4d2 by Abhishek Kadam Committed by nixonrodrigues

ATLAS-2742: UI : Timezone is set to blank when not set while saving classification to entities

parent ef404427
...@@ -89,7 +89,6 @@ define(['require', ...@@ -89,7 +89,6 @@ define(['require',
this.ui.timeZone.html(tzstr); this.ui.timeZone.html(tzstr);
this.ui.timeZone.select2({ this.ui.timeZone.select2({
allowClear: true,
data: moment.tz.names() data: moment.tz.names()
}); });
...@@ -108,7 +107,9 @@ define(['require', ...@@ -108,7 +107,9 @@ define(['require',
endDateObj["minDate"] = this.model.get('startTime'); endDateObj["minDate"] = this.model.get('startTime');
endDateObj["startDate"] = this.model.get('endTime'); endDateObj["startDate"] = this.model.get('endTime');
} }
if (!_.isEmpty(this.model.get('timeZone'))) {
this.ui.timeZone.val(this.model.get('timeZone')).trigger("change", { 'manual': true }); this.ui.timeZone.val(this.model.get('timeZone')).trigger("change", { 'manual': true });
}
} else { } else {
this.model.set('startTime', that.ui.startTime.val()); this.model.set('startTime', that.ui.startTime.val());
this.model.set('endTime', that.ui.endTime.val()); this.model.set('endTime', that.ui.endTime.val());
......
Markdown is supported
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