From e4c334dd677985b7f1453585293f3728f7cbc42c Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Tue, 23 Sep 2014 11:39:10 -0400 Subject: [PATCH] PM-295 Plugin Enterprise que sea parte del core IMPROVEMENT - change redirect. - A validation was add in enable plugin. --- workflow/engine/classes/class.pluginRegistry.php | 2 +- workflow/engine/templates/enterprise/addonsStore.js | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/workflow/engine/classes/class.pluginRegistry.php b/workflow/engine/classes/class.pluginRegistry.php index 9bad6de30..9e21eb471 100755 --- a/workflow/engine/classes/class.pluginRegistry.php +++ b/workflow/engine/classes/class.pluginRegistry.php @@ -259,7 +259,7 @@ class PMPluginRegistry $this->registerFolder( $sNamespace, $sNamespace, $detail->sPluginFolder ); //register the default directory, later we can have more $this->_aPluginDetails[$sNamespace]->enabled = true; - $oPlugin = new $detail->sClassName( $detail->sNamespace, $detail->sFilename ); + $oPlugin = $detail; $this->_aPlugins[$detail->sNamespace] = $oPlugin; if (method_exists( $oPlugin, 'enable' )) { $oPlugin->enable(); diff --git a/workflow/engine/templates/enterprise/addonsStore.js b/workflow/engine/templates/enterprise/addonsStore.js index 0b86fa80a..37ed4d309 100644 --- a/workflow/engine/templates/enterprise/addonsStore.js +++ b/workflow/engine/templates/enterprise/addonsStore.js @@ -732,7 +732,6 @@ Ext.onReady(function() { } if (sw == 1) { - var pm = PROCESSMAKER_URL; uploadForm.getForm().submit({ url: "../enterprise/addonsStoreAction", params: { @@ -740,10 +739,8 @@ Ext.onReady(function() { }, waitMsg: _('ID_UPDATING_LICENSE_MSG'), success: function (form, o) { - //Ext.MessageBox.alert(_('ID_INFORMATION'), _('ID_SUCCESSFULLY_UPLOADED')); - //parent.parent.window.location.href = newLocation(); Ext.MessageBox.alert(_('ID_INFORMATION'), _('ID_SUCCESSFULLY_UPLOADED'), function () { - parent.parent.window.location.href = PROCESSMAKER_URL + (SYS_SKIN.substring(0,2) == 'ux')? "/main/login" :"/setup/login/login"; + parent.parent.window.location.href = newLocation() }); }, failure: function (form, o) {