Merge pull request #2583 from samuelx12/revert/datetime-utc-changes

revert: timezone conversion intended for meta fields, accidentally broke datetime columns

Author: enjeck

src/modules/main/partials/ColumnInfoPopover.vue

@@ -72,8 +72,7 @@ export default {
 	},
 	methods: {
 		relativeDateTime(v) {
-			const value = moment.utc(v).local()
-			return value.format('L') === moment().format('L') ? t('tables', 'Today') + ' ' + value.format('LT') : value.format('LLLL')
+			return moment(v).format('L') === moment().format('L') ? t('tables', 'Today') + ' ' + moment(v).format('LT') : moment(v).format('LLLL')
 		},
 	},
 }

src/shared/components/ncTable/mixins/columnsTypes/datetime.js

@@ -19,7 +19,7 @@ export default class DatetimeColumn extends AbstractDatetimeColumn {
 	}
 
 	formatValue(value) {
-		return Moment.utc(value, 'YYYY-MM-DD HH:mm:ss').local().format('lll')
+		return Moment(value, 'YYYY-MM-DD HH:mm:ss').format('lll')
 	}
 
 	sort(mode, nextSorts) {

src/shared/components/ncTable/mixins/columnsTypes/datetimeDate.js

@@ -15,7 +15,7 @@ export default class DatetimeDateColumn extends AbstractDatetimeColumn {
 	}
 
 	formatValue(value) {
-		return Moment.utc(value, 'YYYY-MM-DD HH:mm:ss').local().format('ll')
+		return Moment(value, 'YYYY-MM-DD HH:mm:ss').format('ll')
 	}
 
 	sort(mode, nextSorts) {

src/shared/components/ncTable/mixins/columnsTypes/datetimeTime.js

@@ -15,7 +15,7 @@ export default class DatetimeTimeColumn extends AbstractDatetimeColumn {
 	}
 
 	formatValue(value) {
-		return Moment.utc(value, 'HH:mm:ss').local().format('LT')
+		return Moment(value, 'HH:mm:ss').format('LT')
 	}
 
 	sort(mode, nextSorts) {

src/shared/components/ncTable/partials/TableCellDateTime.vue

@@ -171,10 +171,7 @@ export default {
 				newValue = 'none'
 			} else {
 				const format = this.getDateFormat()
-				const editDateTimeMoment = Moment(this.editDateTimeValue)
-				newValue = this.column.type === 'datetime-date'
-					? editDateTimeMoment.format(format)
-					: editDateTimeMoment.utc().format(format)
+				newValue = Moment(this.editDateTimeValue).format(format)
 			}
 
 			if (newValue === this.value) {

src/shared/components/ncTable/partials/rowTypePartials/DatetimeForm.vue

@@ -59,7 +59,7 @@ export default {
 				} else if (!v) {
 					this.$emit('update:value', this.isMandatoryField ? null : 'none')
 				} else {
-					this.$emit('update:value', Moment(v).utc().format('YYYY-MM-DD HH:mm'))
+					this.$emit('update:value', Moment(v).format('YYYY-MM-DD HH:mm'))
 				}
 			},
 		},

src/shared/components/ncTable/partials/rowTypePartials/DatetimeTimeForm.vue

@@ -63,7 +63,7 @@ export default {
 				if (v === 'none') {
 					this.$emit('update:value', v)
 				} else if (v) {
-					this.$emit('update:value', Moment(v).utc().format('HH:mm'))
+					this.$emit('update:value', Moment(v).format('HH:mm'))
 				}
 			},
 		},