Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-05 05:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Exposed package data for incompatible plugins to admin/plugins controller, #3480

Browse Source 
ping @psychobunny
This commit is contained in:
Julian Lam
2015-08-24 13:41:25 -04:00
parent 902d11c6af
commit a27c8f0321
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/controllers/admin.js
View File

@@ -269,17 +269,39 @@ adminController.postCache.get = function(req, res, next) {
}; };
adminController.plugins.get = function(req, res, next) { adminController.plugins.get = function(req, res, next) {
plugins.getAll(function(err, plugins) { async.parallel({
compatible: function(next) {
plugins.list(function(err, plugins) {
if (err || !Array.isArray(plugins)) { if (err || !Array.isArray(plugins)) {
plugins = []; plugins = [];
} }
next(null, plugins);
});
},
all: function(next) {
plugins.list(false, function(err, plugins) {
if (err || !Array.isArray(plugins)) {
plugins = [];
}
next(null, plugins);
});
}
}, function(err, payload) {
var compatiblePkgNames = payload.compatible.map(function(pkgData) {
return pkgData.name;
});
res.render('admin/extend/plugins' , { res.render('admin/extend/plugins' , {
installed: plugins.filter(function(plugin) { installed: payload.compatible.filter(function(plugin) {
return plugin.installed; return plugin.installed;
}), }),
download: plugins.filter(function(plugin) { download: payload.compatible.filter(function(plugin) {
return !plugin.installed; return !plugin.installed;
}),
incompatible: payload.all.filter(function(plugin) {
return compatiblePkgNames.indexOf(plugin.name) === -1;
}) })
}); });
}); });

9
src/plugins.js
View File

@@ -195,8 +195,13 @@ var fs = require('fs'),
}); });
}; };
Plugins.getAll = function(callback) { Plugins.list = function(matching, callback) {
var url = (nconf.get('registry') || 'https://packages.nodebb.org') + '/api/v1/plugins?version=' + require('../package.json').version; if (arguments.length === 1 && typeof matching === 'function') {
callback = matching;
matching = true;
}
var url = (nconf.get('registry') || 'https://packages.nodebb.org') + '/api/v1/plugins' + (matching !== false ? '?version=' + require('../package.json').version : '');
require('request')(url, { require('request')(url, {
json: true json: true