milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix an issue with plugin installation

Browse source
This commit is contained in:
dkanada 2020-05-25 01:33:24 +09:00
parent ca4001f5b7
commit a9f1157330
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/dashboard/plugins/add.js
View file

@ -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 developer = $('#developer', page).html().toLowerCase();
var alertCallback = function () { var alertCallback = function () {
loading.show(); loading.show();
page.querySelector('#btnInstall').disabled = true; page.querySelector('#btnInstall').disabled = true;
ApiClient.installPlugin(packageName, guid, updateClass, version).then(function () { ApiClient.installPlugin(guid, version).then(function () {
loading.hide(); loading.hide();
alertText(globalize.translate('PluginInstalledMessage')); alertText(globalize.translate('PluginInstalledMessage'));
}); });
@ -112,9 +112,8 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'connectionManager', 'e
var installedPlugin = plugins.filter(function (plugin) { var installedPlugin = plugins.filter(function (plugin) {
return plugin.Name == name; return plugin.Name == name;
})[0]; })[0];
var vals = $('#selectVersion', page).val().split('|');
var version = vals[0];
var version = $('#selectVersion', page).val();
if (installedPlugin) { if (installedPlugin) {
if (installedPlugin.Version === version) { if (installedPlugin.Version === version) {
loading.hide(); loading.hide();
@ -124,7 +123,7 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'connectionManager', 'e
}); });
} }
} else { } else {
performInstallation(page, name, guid, vals[1], version); performInstallation(page, guid, version);
} }
}); });
return false; return false;