yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-10 23:29:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(admin): change timezone manager from admin when db is sql

Browse Source
This commit is contained in:
Johann Pinson 2018-06-20 16:49:21 +02:00
parent f44973ffd1
commit d9f5af24d5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-knex/lib/index.js
View File

@ -98,8 +98,8 @@ module.exports = strapi => {
schema: _.get(connection.settings, 'schema') || 'public', schema: _.get(connection.settings, 'schema') || 'public',
port: _.get(connection.settings, 'port'), port: _.get(connection.settings, 'port'),
socket: _.get(connection.settings, 'socketPath'), socket: _.get(connection.settings, 'socketPath'),
ssl: _.get(connection.settings, 'ssl') || false ssl: _.get(connection.settings, 'ssl') || false,
timezone: _.get(connection.settings, 'timezone') || 'utc',
}, },
debug: _.get(connection.options, 'debug') || false, debug: _.get(connection.options, 'debug') || false,
acquireConnectionTimeout: _.get(connection.options, 'acquireConnectionTimeout'), acquireConnectionTimeout: _.get(connection.options, 'acquireConnectionTimeout'),

4
packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js
View File

@ -53,9 +53,9 @@ class TableRow extends React.Component {
const date = value && isObject(value) && value._isAMomentObject === true ? const date = value && isObject(value) && value._isAMomentObject === true ?
value : value :
moment(value); moment.utc(value);
return date.utc().format('YYYY-MM-DD HH:mm:ss'); return date.format('YYYY-MM-DD HH:mm:ss');
} }
case 'password': case 'password':
return '••••••••'; return '••••••••';