fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in marcoAntonioNina/processmaker/PM-295 (pull request #812)

Browse Source 
PM-295 Plugin Enterprise que sea parte del core IMPROVEMENT
This commit is contained in:
Julio Cesar Laura Avendaño
2014-09-23 11:49:26 -04:00
parent 28428bb27c e4c334dd67
commit e4e96bcb4f
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.pluginRegistry.php
View File

@@ -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();

5
workflow/engine/templates/enterprise/addonsStore.js
View File

@@ -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) {