diff --git a/workflow/engine/methods/enterprise/addonsStoreAction.php b/workflow/engine/methods/enterprise/addonsStoreAction.php index ed1522b0a..28711a9a9 100644 --- a/workflow/engine/methods/enterprise/addonsStoreAction.php +++ b/workflow/engine/methods/enterprise/addonsStoreAction.php @@ -125,14 +125,6 @@ try { } file_put_contents(PATH_DATA_SITE . "plugin.singleton", $pluginRegistry->serializeInstance()); - - /////// - $message = "A license has been correctly installed. Please login again to apply the changes"; - G::SendMessageText($message, "INFO"); - $_SESSION["___PMEE_INSTALLED_LIC___"] = $message; - - //G::header("location: ../enterprise/pluginsList"); //ok - //exit(0); } } break; diff --git a/workflow/engine/templates/enterprise/addonsStore.js b/workflow/engine/templates/enterprise/addonsStore.js index a23f2140e..0b4449647 100644 --- a/workflow/engine/templates/enterprise/addonsStore.js +++ b/workflow/engine/templates/enterprise/addonsStore.js @@ -763,20 +763,17 @@ Ext.onReady(function() { waitTitle: _('ID_PLEASE_WAIT'), waitMsg: _('ID_UPDATING_LICENSE_MSG'), success: function (form, o) { - Ext.MessageBox.alert(_('ID_INFORMATION'), _('ID_SUCCESSFULLY_UPLOADED'), function () { + Ext.MessageBox.alert(_('ID_INFORMATION'), _('ID_SUCCESSFULLY_UPLOADED') + ' ' + _('ID_ENTERPRISE_INSTALLED'), function () { parent.parent.window.location.href = newLocation(); }); }, failure: function (form, action) { if (action.failureType == 'server') { parent.parent.window.location.href = newLocation(); - } else if (action.failureType == 'client') { - var dataResponse = eval("(" + action.response.responseText.trim() + ")"); //json - Ext.MessageBox.alert(_('ID_WARNING'), (dataResponse.errors)? dataResponse.errors : _('ID_WARNING_ERROR_UPDATING')); - } else { - var dataResponse = eval("(" + action.response.responseText.trim() + ")"); //json - Ext.MessageBox.alert(_('ID_WARNING'), (dataResponse.errors)? dataResponse.errors : _('ID_WARNING_ERROR_UPDATING')); + return; } + var dataResponse = eval("(" + action.response.responseText.trim() + ")"); //json + Ext.MessageBox.alert(_('ID_WARNING'), (dataResponse.errors)? dataResponse.errors : _('ID_WARNING_ERROR_UPDATING')); } }); }