fixed client-side so semver doesn't explode when nbbpm returns 'latest', fixed tests so they pass again, #2363

v1.18.x
Julian Lam 11 years ago
parent 19297e2d22
commit 52285239e9

@ -55,7 +55,7 @@ define('admin/extend/plugins', function() {
Plugins.suggest(pluginID, function(err, payload) { Plugins.suggest(pluginID, function(err, payload) {
if (!err) { if (!err) {
require(['semver'], function(semver) { require(['semver'], function(semver) {
if (semver.gt(payload.version, parent.find('.currentVersion').text())) { if (payload.version === 'latest' || semver.gt(payload.version, parent.find('.currentVersion').text())) {
btn.attr('disabled', true).find('i').attr('class', 'fa fa-refresh fa-spin'); btn.attr('disabled', true).find('i').attr('class', 'fa fa-refresh fa-spin');
socket.emit('admin.plugins.upgrade', { socket.emit('admin.plugins.upgrade', {
id: pluginID, id: pluginID,

@ -26,8 +26,9 @@ module.exports = function(Meta) {
Meta.configs.list = function (callback) { Meta.configs.list = function (callback) {
db.getObject('config', function (err, config) { db.getObject('config', function (err, config) {
config = config || {};
config.version = pkg.version; config.version = pkg.version;
callback(err, config || {}); callback(err, config);
}); });
}; };

Loading…
Cancel
Save