mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-11-30 01:42:29 +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
70 lines
2.6 KiB
JavaScript
70 lines
2.6 KiB
JavaScript
import Ember from 'ember';
|
|
|
|
const {
|
|
Component,
|
|
computed,
|
|
inject: {service}
|
|
} = Ember;
|
|
|
|
export default Component.extend({
|
|
tagName: '',
|
|
|
|
user: null,
|
|
isSending: false,
|
|
|
|
notifications: service(),
|
|
|
|
createdAt: computed('user.createdAt', function () {
|
|
let createdAt = this.get('user.createdAt');
|
|
|
|
return createdAt ? moment(createdAt).fromNow() : '';
|
|
}),
|
|
|
|
actions: {
|
|
resend() {
|
|
let user = this.get('user');
|
|
let notifications = this.get('notifications');
|
|
|
|
this.set('isSending', true);
|
|
user.resendInvite().then((result) => {
|
|
let notificationText = `Invitation resent! (${user.get('email')})`;
|
|
|
|
// If sending the invitation email fails, the API will still return a status of 201
|
|
// but the user's status in the response object will be 'invited-pending'.
|
|
if (result.users[0].status === 'invited-pending') {
|
|
notifications.showAlert('Invitation email was not sent. Please try resending.', {type: 'error', key: 'invite.resend.not-sent'});
|
|
} else {
|
|
user.set('status', result.users[0].status);
|
|
notifications.showNotification(notificationText, {key: 'invite.resend.success'});
|
|
}
|
|
}).catch((error) => {
|
|
notifications.showAPIError(error, {key: 'invite.resend'});
|
|
}).finally(() => {
|
|
this.set('isSending', false);
|
|
});
|
|
},
|
|
|
|
revoke() {
|
|
let user = this.get('user');
|
|
let email = user.get('email');
|
|
let notifications = this.get('notifications');
|
|
|
|
// reload the user to get the most up-to-date information
|
|
user.reload().then(() => {
|
|
if (user.get('invited')) {
|
|
user.destroyRecord().then(() => {
|
|
let notificationText = `Invitation revoked. (${email})`;
|
|
notifications.showNotification(notificationText, {key: 'invite.revoke.success'});
|
|
}).catch((error) => {
|
|
notifications.showAPIError(error, {key: 'invite.revoke'});
|
|
});
|
|
} else {
|
|
// if the user is no longer marked as "invited", then show a warning and reload the route
|
|
this.sendAction('reload');
|
|
notifications.showAlert('This user has already accepted the invitation.', {type: 'error', delayed: true, key: 'invite.revoke.already-accepted'});
|
|
}
|
|
});
|
|
}
|
|
}
|
|
});
|