mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-10 23:36:14 -05:00
Merge pull request #3613 from ErisDS/update-notification
Improved Update Notification
This commit is contained in:
commit
1219817628
2 changed files with 6 additions and 5 deletions
|
@ -18,8 +18,8 @@ adminControllers = {
|
|||
|
||||
updateCheck().then(function () {
|
||||
return updateCheck.showUpdateNotification();
|
||||
}).then(function (updateAvailable) {
|
||||
if (!updateAvailable) {
|
||||
}).then(function (updateVersion) {
|
||||
if (!updateVersion) {
|
||||
return when.resolve();
|
||||
}
|
||||
|
||||
|
@ -28,10 +28,11 @@ adminControllers = {
|
|||
location: 'top',
|
||||
dismissible: false,
|
||||
status: 'persistent',
|
||||
message: 'A new version of Ghost is available! Hot Damn. <a href="https://ghost.org/download">Upgrade now</a>'
|
||||
message: '<a href="https://ghost.org/download">Ghost ' + updateVersion +
|
||||
'</a> is available! Hot Damn. Please <a href="http://support.ghost.org/how-to-upgrade/">upgrade</a> now'
|
||||
};
|
||||
|
||||
return api.notifications.browse().then(function (results) {
|
||||
return api.notifications.browse({context: {internal: true}}).then(function (results) {
|
||||
if (!_.some(results.notifications, { message: notification.message })) {
|
||||
return api.notifications.add({ notifications: [notification] }, {context: {internal: true}});
|
||||
}
|
||||
|
|
|
@ -210,7 +210,7 @@ function showUpdateNotification() {
|
|||
}
|
||||
|
||||
if (display && display.value && currentVersion && semver.gt(display.value, currentVersion)) {
|
||||
return when(true);
|
||||
return when(currentVersion);
|
||||
}
|
||||
return when(false);
|
||||
});
|
||||
|
|
Loading…
Add table
Reference in a new issue