NodeBB could not reach the package manager, proceed with installation of latest version?
NodeBB could not reach the package manager, an upgrade is not suggested at this time.
", "alert.incompatible": "Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.
", - "alert.possibly-incompatible": "No Compatibility Information Found
This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.
In the event that NodeBB cannot boot properly:
$ ./nodebb reset plugin=\"%1\"Continue installation of latest version of this plugin?
" + "alert.possibly-incompatible": "No Compatibility Information Found
This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.
In the event that NodeBB cannot boot properly:
$ ./nodebb reset plugin=\"%1\"Continue installation of latest version of this plugin?
", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js index 9622b4fbc0..bd8ba1b6cb 100644 --- a/public/src/admin/extend/plugins.js +++ b/public/src/admin/extend/plugins.js @@ -21,33 +21,63 @@ define('admin/extend/plugins', ['jqueryui', 'translator'], function (jqueryui, t var pluginEl = $(this).parents('li'); pluginID = pluginEl.attr('data-plugin-id'); var btn = $('#' + pluginID + ' [data-action="toggleActive"]'); - socket.emit('admin.plugins.toggleActive', pluginID, function (err, status) { - if (err) { - return app.alertError(err); - } - translator.translate(' [[admin/extend/plugins:plugin-item.' + (status.active ? 'deactivate' : 'activate') + ']]', function (buttonText) { - btn.html(buttonText); - btn.toggleClass('btn-warning', status.active).toggleClass('btn-success', !status.active); + var pluginData = ajaxify.data.installed[pluginEl.attr('data-plugin-index')]; - // clone it to active plugins tab - if (status.active && !$('#active #' + pluginID).length) { - $('#active ul').prepend(pluginEl.clone(true)); + function toggleActivate () { + socket.emit('admin.plugins.toggleActive', pluginID, function (err, status) { + if (err) { + return app.alertError(err); } + translator.translate(' [[admin/extend/plugins:plugin-item.' + (status.active ? 'deactivate' : 'activate') + ']]', function (buttonText) { + btn.html(buttonText); + btn.toggleClass('btn-warning', status.active).toggleClass('btn-success', !status.active); + + // clone it to active plugins tab + if (status.active && !$('#active #' + pluginID).length) { + $('#active ul').prepend(pluginEl.clone(true)); + } + + // Toggle active state in template data + pluginData.active = !pluginData.active; + + app.alert({ + alert_id: 'plugin_toggled', + title: '[[admin/extend/plugins:alert.' + (status.active ? 'enabled' : 'disabled') + ']]', + message: '[[admin/extend/plugins:alert.' + (status.active ? 'activate-success' : 'deactivate-success') + ']]', + type: status.active ? 'warning' : 'success', + timeout: 5000, + clickfn: function () { + require(['admin/modules/instance'], function (instance) { + instance.restart(); + }); + }, + }); + }); + }); + } - app.alert({ - alert_id: 'plugin_toggled', - title: '[[admin/extend/plugins:alert.' + (status.active ? 'enabled' : 'disabled') + ']]', - message: '[[admin/extend/plugins:alert.' + (status.active ? 'activate-success' : 'deactivate-success') + ']]', - type: status.active ? 'warning' : 'success', - timeout: 5000, - clickfn: function () { - require(['admin/modules/instance'], function (instance) { - instance.restart(); - }); + if (pluginData.license && pluginData.active !== true) { + templates.parse('admin/partials/plugins/license', pluginData, function (html) { + var modal = bootbox.dialog({ + title: '[[admin/extend/plugins:license.title]]', + message: html, + size: 'large', + buttons: { + cancel: { + label: '[[modules:bootbox.cancel]]', + className: 'btn-link', + }, + save: { + label: '[[modules:bootbox.confirm]]', + className: 'btn-primary', + callback: toggleActivate, + } }, }); }); - }); + } else { + toggleActivate(pluginID); + } }); pluginsList.on('click', 'button[data-action="toggleInstall"]', function () { diff --git a/src/plugins/data.js b/src/plugins/data.js index 8591346a7e..ed81eed678 100644 --- a/src/plugins/data.js +++ b/src/plugins/data.js @@ -44,9 +44,20 @@ function loadPluginInfo(pluginPath, callback) { } var pluginData; var packageData; + var licenseData; try { pluginData = JSON.parse(results.plugin); packageData = JSON.parse(results.package); + try { + licenseData = require('spdx-license-list/licenses/' + packageData.license); + pluginData.license = { + name: licenseData.name, + text: licenseData.licenseText, + }; + } catch (e) { + // No license matched + pluginData.license = null; + } pluginData.id = packageData.name; pluginData.name = packageData.name; @@ -55,7 +66,6 @@ function loadPluginInfo(pluginPath, callback) { pluginData.repository = packageData.repository; pluginData.nbbpm = packageData.nbbpm; pluginData.path = pluginPath; - pluginData.license = packageData.license; } catch (err) { var pluginDir = path.basename(pluginPath); diff --git a/src/views/admin/partials/installed_plugin_item.tpl b/src/views/admin/partials/installed_plugin_item.tpl index 2e95606ef8..0a7524c815 100644 --- a/src/views/admin/partials/installed_plugin_item.tpl +++ b/src/views/admin/partials/installed_plugin_item.tpl @@ -1,5 +1,5 @@ -{license.text}+ +[[admin/extend/plugins:license.cta]] \ No newline at end of file