From a9f1157330deae112286fa2ef999b7e1c05f3425 Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 25 May 2020 01:33:24 +0900 Subject: [PATCH 1/2] fix an issue with plugin installation --- src/controllers/dashboard/plugins/add.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/controllers/dashboard/plugins/add.js b/src/controllers/dashboard/plugins/add.js index 1ceee102e..72a6ea106 100644 --- a/src/controllers/dashboard/plugins/add.js +++ b/src/controllers/dashboard/plugins/add.js @@ -71,13 +71,13 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'connectionManager', 'e }); } - function performInstallation(page, packageName, guid, updateClass, version) { + function performInstallation(page, guid, version) { var developer = $('#developer', page).html().toLowerCase(); var alertCallback = function () { loading.show(); page.querySelector('#btnInstall').disabled = true; - ApiClient.installPlugin(packageName, guid, updateClass, version).then(function () { + ApiClient.installPlugin(guid, version).then(function () { loading.hide(); alertText(globalize.translate('PluginInstalledMessage')); }); @@ -112,9 +112,8 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'connectionManager', 'e var installedPlugin = plugins.filter(function (plugin) { return plugin.Name == name; })[0]; - var vals = $('#selectVersion', page).val().split('|'); - var version = vals[0]; + var version = $('#selectVersion', page).val(); if (installedPlugin) { if (installedPlugin.Version === version) { loading.hide(); @@ -124,7 +123,7 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'connectionManager', 'e }); } } else { - performInstallation(page, name, guid, vals[1], version); + performInstallation(page, guid, version); } }); return false; From 51abc05d539157dc7ee4254d9105788bc0374ce5 Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 25 May 2020 01:38:47 +0900 Subject: [PATCH 2/2] add name back as a parameter --- src/controllers/dashboard/plugins/add.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controllers/dashboard/plugins/add.js b/src/controllers/dashboard/plugins/add.js index 72a6ea106..8b1deb804 100644 --- a/src/controllers/dashboard/plugins/add.js +++ b/src/controllers/dashboard/plugins/add.js @@ -71,13 +71,13 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'connectionManager', 'e }); } - function performInstallation(page, guid, version) { + function performInstallation(page, name, guid, version) { var developer = $('#developer', page).html().toLowerCase(); var alertCallback = function () { loading.show(); page.querySelector('#btnInstall').disabled = true; - ApiClient.installPlugin(guid, version).then(function () { + ApiClient.installPlugin(name, guid, version).then(function () { loading.hide(); alertText(globalize.translate('PluginInstalledMessage')); }); @@ -123,7 +123,7 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'connectionManager', 'e }); } } else { - performInstallation(page, guid, version); + performInstallation(page, name, guid, version); } }); return false;