PM-723 error 404 al importar licencia enterprise SOLVED

- no se carga un archivo dando error 404.
- el archivo ya no existe ahora redireciona al archivo correcto.

workflow/engine/classes/class.pmLicenseManager.php

@@ -371,7 +371,7 @@ class pmLicenseManager
             $oServerConf->setProperty ( 'ACTIVE_LICENSE',array(SYS_SYS => $path));
             $this->saveDataLicense( $results, $path, $redirect );
             if ($redirect) {
-                G::Header ( 'location: licenseManagerList' );
+                G::Header ( 'location: ../enterprise/addonsStore' );
             } else {
                 return true;
             }

workflow/engine/methods/enterprise/processMakerAjax.php

@@ -286,6 +286,8 @@ switch ($option) {
         break;
     case "list":
         $status = 1;
+        $response = new stdclass();
+        $response->status = 'OK';
         try {
             if (EnterpriseUtils::getInternetConnection() == 0) {
                 throw (new Exception("Enterprise Plugins Manager no connected to internet."));

workflow/engine/templates/enterprise/addonsStore.js

@@ -42,21 +42,9 @@ Ext.onReady(function() {
           }
         }
 
-        if (sw == 0) {
-          Ext.ComponentMgr.get("cboPmVersion").setDisabled(true);
-          Ext.ComponentMgr.get("btnPmUpgrade").setDisabled(true);
-        }
       },
       load: function (store, record, option) {
-        Ext.ComponentMgr.get("cboPmVersion").setDisabled(false);
+        //
-        Ext.ComponentMgr.get("btnPmUpgrade").setDisabled(false);
-
-        if (store.getAt(0)) {
-          Ext.ComponentMgr.get("cboPmVersion").setValue(store.getAt(0).get(Ext.ComponentMgr.get("cboPmVersion").valueField));
-        } else {
-          Ext.ComponentMgr.get("cboPmVersion").setDisabled(true);
-          Ext.ComponentMgr.get("btnPmUpgrade").setDisabled(true);
-        }
       }
     }
   });
@@ -100,50 +88,6 @@ Ext.onReady(function() {
     }
     return site;
   }
-  function processMakerUpgrade() {
-    swReloadTask = 0;
-    var noticeWindow = new Ext.Window({
-      closable: false,
-      autoHeight: true,
-      modal: true,
-      width: 600,
-      height: 350,
-      id: "notice_window",
-      title: _('ID_BEFORE_UPDATE'),
-      bodyStyle: "font: normal 13px sans;",
-      bbar: new Ext.Toolbar({
-        buttonAlign: "center",
-        padding: 15,
-        items: [
-        {
-          id: "upgrade-continue",
-          //text: " Continue » ",
-          text: _('ID_CONTINUE')+" >> ",
-          handler: function () {
-            noticeWindow.hide();
-
-            processMakerInstall();
-          }
-        },
-        {
-          id: "upgrade-cancel",
-          text: "<b> "+ _('ID_CANCEL')+" </b>",
-          handler: function () {
-            swReloadTask = 1;
-            noticeWindow.hide();
-          }
-        }]
-      }),
-      items: [{
-        id: "notice",
-        preventBodyReset : true,
-        padding: 15,
-        html: _('ID_CAUTION_NOTICE')
-      }]
-    });
-
-    noticeWindow.show();
-  }
 
   function upgradeStatus(addonId, storeId, record) {
     upgradeAddonId = addonId;
@@ -393,7 +337,6 @@ Ext.onReady(function() {
       var myMask = new Ext.LoadMask(Ext.getBody(), {msg: _('ID_WAIT_WHILE_UPGRADING_PROCESSMAKER')});
       myMask.show();
 
-      var cboPm = Ext.ComponentMgr.get("cboPmVersion");
 
       var record = cboPm.findRecord(cboPm.valueField, cboPm.getValue());
       var index  = cboPm.store.indexOf(record);
@@ -499,9 +442,6 @@ Ext.onReady(function() {
 
                       reloadTask.cancel();
 
-                      Ext.ComponentMgr.get("cboPmVersion").reset();
-                      Ext.ComponentMgr.get("cboPmVersion").store.load();
-
                       addonsStore.load({
                           params: {
                               "force": true
@@ -567,16 +507,11 @@ Ext.onReady(function() {
       "load": function(store, records, options) {
         //reloadTask.delay(15000); //1 millisecond = 0.001 seconds
 
-        //Ext.ComponentMgr.get('btnPmUpgrade').disable();
         Ext.ComponentMgr.get('loading-indicator').setValue("");
         progressWindow.hide();
         store.filterBy(function (record, id) {
             if (record.get('type') == 'core') {
                 coreRecord = record.copy();
-
-            //Ext.ComponentMgr.get('btnPmUpgrade').enable();
-            //console.log("Core state: " + record.get('status'));
-            //console.log(record);
                 status = record.get('status');
                 if (status == "download-start" || status == "download" || status == "install" || status == "install-finish") {
                     upgradeStatus(record.get('id'), record.get('store'), record);
@@ -824,17 +759,24 @@ Ext.onReady(function() {
                 params: {
                     action: "importLicense"
                 },
+                method: 'POST',
+                waitTitle: _('ID_PLEASE_WAIT'),
                 waitMsg: _('ID_UPDATING_LICENSE_MSG'),
                 success: function (form, o) {
                     Ext.MessageBox.alert(_('ID_INFORMATION'), _('ID_SUCCESSFULLY_UPLOADED'), function () {
-                    parent.parent.window.location.href = newLocation()
+                        parent.parent.window.location.href = newLocation();
                     });
                 },
-              failure: function (form, o) {
+                failure: function (form, action) {
-                var dataResponse = eval("(" + o.response.responseText + ")"); //json
+                    if (action.failureType == 'server') {
-                console.log('error', dataResponse);
+                        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'));
+                    }
                 }
             });
           }
@@ -939,81 +881,6 @@ Ext.onReady(function() {
     }]
   });
 
-  var pnlUpgrade = new Ext.FormPanel({
-      frame: true,
-      title: _('ID_UPGRADE_SYSTEM'),
-
-      bodyStyle: "padding: 5px 5px 5px 5px;",
-      disabled: !licensed,
-
-      items: [
-          {
-              layout: "column",
-              items: [
-                      {
-                          columnWidth: 0.20,
-                          xtype: "label",
-                          text: _('ID_CURRENT_VERSION') + ":"
-                      },
-                      {
-                          columnWidth: 0.60,
-                          xtype: "label",
-                          text: PROCESSMAKER_VERSION
-                      },
-                      {
-                          columnWidth: 0.20,
-                          xtype: "label",
-                          text: ""
-                      }
-              ]
-          },
-          {
-              layout: "column",
-              style: "margin-top: 10px;",
-              items: [
-                      {
-                          columnWidth: 0.20,
-                          xtype: "label",
-                          text: _('ID_LATEST_VERSION') + ":"
-                      },
-                      {
-                          columnWidth: 0.60,
-                          xtype: "container",
-                          items: [
-                              {
-                                  xtype: "combo",
-                                  id: "cboPmVersion",
-                                  editable: false,
-                                  store: storePM,
-                                  triggerAction: "all",
-                                  autoSelect: true,
-                                  mode: "local",
-                                  valueField:   "OBJ_VERSION",
-                                  displayField: "OBJ_VERSION_NAME",
-                                  hidden:true,
-                                  emptyText: _('ID_NO_NEW_VERSIONS')
-                              }
-                          ]
-                      },
-                      {
-                          columnWidth: 0.20,
-                          xtype: "button",
-                          id: "btnPmUpgrade",
-                          text: _('ID_UPGRADE_LABEL'),
-                          disabled: true,
-                          handler: function () {
-                              if (INTERNET_CONNECTION == 1) {
-                                  processMakerUpgrade();
-                              } else {
-                                  Ext.MessageBox.alert(_('ID_INFORMATION'), _('ID_NO_INTERNET_CONECTION'));
-                              }
-                          }
-                      }
-              ]
-          }
-      ]
-  });
-
     var pnlSetup = new Ext.FormPanel({
         frame: true,
         height: 160,
@@ -1087,12 +954,8 @@ Ext.onReady(function() {
 
   var licensePanel = new Ext.FormPanel( {
     frame: true,
-    labelWidth: 130,
     labelAlign: "right",
     defaultType: "displayfield",
-    autoHeight: true,
-    buttonAlign: 'left',
-
     items: [
         {
             id: "license_name",
@@ -1111,7 +974,6 @@ Ext.onReady(function() {
             hideLabel: licensed,
             value: "<font color='red'>"+license_message+"</font>&nbsp;("+license_start_date+"/"+license_end_date+")<br />"+license_user
         },
-
         {
             id: "license_user",
             fieldLabel: _('ID_ISSUED_TO'),
@@ -1119,7 +981,6 @@ Ext.onReady(function() {
             hidden: !licensed,
             hideLabel: !licensed
         },
-
         {
             id: "license_expires",
             fieldLabel: _('ID_EXPIRES'),
@@ -1287,13 +1148,10 @@ Ext.onReady(function() {
     items: [btnEnable, btnDisable, btnAdmin]
   });
 
-    var addonsGrid = new Ext.grid.GridPanel({
+    var addonsGrid = new Ext.grid.EditorGridPanel({
         store: addonsStore,
-        colspan: 2,
+        defaultType: "displayfield",
-        flex: 1,
         padding: 5,
-        //anchor : '100%',
-        //height: 300,
         autoHeight : true,
         disabled: !licensed,
         columns: [
@@ -1417,18 +1275,6 @@ Ext.onReady(function() {
             }
         ],
         tbar:[
-            /*{
-                text:'Install',
-                tooltip:'Install this addon',
-                //iconCls:'add',
-                handler: function(b, e) {
-                  record = addonsGrid.getSelectionModel().getSelected();
-                  console.log(record.get('name') + ' ' + record.get('store'));
-                  installAddon(record.get('name'), record.get('store'));
-                }
-            },
-            btnUninstall,
-            '-',*/
             btnEnable,
             btnDisable,
             btnAdmin,
@@ -1733,7 +1579,11 @@ Ext.onReady(function() {
     var tabEnterprise = new Ext.TabPanel({
         activeTab: 0,
         height: 370,
-        defaults:{autoScroll: true},
+        defaults:{
+            autoScroll: true,
+            layout:'form',
+            frame:true,
+        },
         items:[{
                 title:  _('ID_ENTERPRISE_PLUGINS'),
                 items : addonsGrid