mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-01-04 08:54:36 +03:00
24e71ffdaa
closes TryGhost/Ghost#6406 follow-up PR of #2 - adds a `timeZone` Service to provide the offset (=timezone reg. moment-timezone) of the users blog settings - `gh-datetime-input` will read the offset of the timezone now and adjust the `publishedAt` date with it. This is the date which will be shown in the PSM 'Publish Date' field. When the user writes a new date/time, the offset is considered and will be deducted again before saving it to the model. This way, we always work with a UTC publish date except for this input field. - gets `availableTimezones` from `configuration/timezones` API endpoint - adds a `moment-utc` transform on all date attr (`createdAt`, `updatedAt`, `publishedAt`, `unsubscribedAt` and `lastLogin`) to only work with UTC times on serverside - when switching the timezone in the select box, the user will be shown the local time of the selected timezone - `createdAt`-property in `gh-user-invited` returns now `moment(createdAt).fromNow()` as `createdAt` is a moment date already - added clock service to show actual time ticking below select box - default timezone is '(GMT) Greenwich Mean Time : Dublin, Edinburgh, London' - if no timezone is saved in the settings yet, the default value will be used - shows the local time in 'Publish Date' in PSM by default, until user overwrites it - adds dependency `moment-timezone 0.5.4` to `bower.json` --------- **Tests:** - sets except for clock service in test env - adds fixtures to mirage - adds `service.ajax` and `service:ghostPaths` to navigation-test.js - adds unit test for `gh-format-timeago` helper - updates acceptance test `general-setting` - adds acceptance test for `editor` - adds integration tests for `services/config` and `services/time-zone` --------- **Todos:** - [ ] Integration tests: ~~`services/config`~~, ~~`services/time-zone`~~, `components/gh-datetime-input` - [x] Acceptance test: `editor` - [ ] Unit tests: `utils/date-formatting` - [ ] write issue for renaming date properties (e. g. `createdAt` to `createdAtUTC`) and translate those for server side with serializers
65 lines
1.5 KiB
JavaScript
65 lines
1.5 KiB
JavaScript
import Ember from 'ember';
|
|
|
|
const {
|
|
Service,
|
|
_ProxyMixin,
|
|
computed,
|
|
inject: {service}
|
|
} = Ember;
|
|
|
|
function isNumeric(num) {
|
|
return Ember.$.isNumeric(num);
|
|
}
|
|
|
|
function _mapType(val, type) {
|
|
if (val === '') {
|
|
return null;
|
|
} else if (type === 'bool') {
|
|
return (val === 'true') ? true : false;
|
|
} else if (type === 'int' && isNumeric(val)) {
|
|
return +val;
|
|
} else if (type === 'json') {
|
|
try {
|
|
return JSON.parse(val);
|
|
} catch (e) {
|
|
return val;
|
|
}
|
|
} else { // assume string if type is null or matches nothing else
|
|
return val;
|
|
}
|
|
}
|
|
|
|
export default Service.extend(_ProxyMixin, {
|
|
ajax: service(),
|
|
ghostPaths: service(),
|
|
|
|
content: computed(function () {
|
|
let metaConfigTags = Ember.$('meta[name^="env-"]');
|
|
let config = {};
|
|
|
|
metaConfigTags.each((i, el) => {
|
|
let key = el.name;
|
|
let value = el.content;
|
|
let type = el.getAttribute('data-type');
|
|
|
|
let propertyName = key.substring(4);
|
|
|
|
config[propertyName] = _mapType(value, type);
|
|
});
|
|
|
|
return config;
|
|
}),
|
|
|
|
availableTimezones: computed(function() {
|
|
let timezonesUrl = this.get('ghostPaths.url').api('configuration', 'timezones');
|
|
|
|
return this.get('ajax').request(timezonesUrl).then((configTimezones) => {
|
|
let [ timezonesObj ] = configTimezones.configuration;
|
|
|
|
timezonesObj = timezonesObj.timezones;
|
|
|
|
return timezonesObj;
|
|
});
|
|
})
|
|
});
|