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

PM-723 error 404 al importar licencia enterprise SOLVED

Browse Source 
- no se carga un archivo dando error 404.
- el archivo ya no existe ahora redireciona al archivo correcto.
This commit is contained in:
Marco Antonio Nina
2014-10-23 12:31:40 -04:00
parent b9edbad86e
commit 541aa402e8
3 changed files with 72 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
workflow/engine/methods/enterprise/processMakerAjax.php
View File

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

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

@@ -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) { 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; 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) { function upgradeStatus(addonId, storeId, record) {
upgradeAddonId = addonId; upgradeAddonId = addonId;
@@ -393,7 +337,6 @@ Ext.onReady(function() {
var myMask = new Ext.LoadMask(Ext.getBody(), {msg: _('ID_WAIT_WHILE_UPGRADING_PROCESSMAKER')}); var myMask = new Ext.LoadMask(Ext.getBody(), {msg: _('ID_WAIT_WHILE_UPGRADING_PROCESSMAKER')});
myMask.show(); myMask.show();
var cboPm = Ext.ComponentMgr.get("cboPmVersion");
var record = cboPm.findRecord(cboPm.valueField, cboPm.getValue()); var record = cboPm.findRecord(cboPm.valueField, cboPm.getValue());
var index = cboPm.store.indexOf(record); var index = cboPm.store.indexOf(record);
@@ -499,9 +442,6 @@ Ext.onReady(function() {
reloadTask.cancel(); reloadTask.cancel();
Ext.ComponentMgr.get("cboPmVersion").reset();
Ext.ComponentMgr.get("cboPmVersion").store.load();
addonsStore.load({ addonsStore.load({
params: { params: {
"force": true "force": true
@@ -567,22 +507,17 @@ Ext.onReady(function() {
"load": function(store, records, options) { "load": function(store, records, options) {
//reloadTask.delay(15000); //1 millisecond = 0.001 seconds //reloadTask.delay(15000); //1 millisecond = 0.001 seconds
//Ext.ComponentMgr.get('btnPmUpgrade').disable();
Ext.ComponentMgr.get('loading-indicator').setValue(""); Ext.ComponentMgr.get('loading-indicator').setValue("");
progressWindow.hide(); progressWindow.hide();
store.filterBy(function (record, id) { store.filterBy(function (record, id) {
if (record.get('type') == 'core') { if (record.get('type') == 'core') {
coreRecord = record.copy(); coreRecord = record.copy();
status = record.get('status');
//Ext.ComponentMgr.get('btnPmUpgrade').enable(); if (status == "download-start" || status == "download" || status == "install" || status == "install-finish") {
//console.log("Core state: " + record.get('status')); upgradeStatus(record.get('id'), record.get('store'), record);
//console.log(record); }
status = record.get('status'); return false;
if (status == "download-start" || status == "download" || status == "install" || status == "install-finish") {
upgradeStatus(record.get('id'), record.get('store'), record);
} }
return false;
}
if (record.get('status') == 'download-start' || record.get('status') == 'download' || record.get('status') == 'cancel' || record.get('status') == 'install') { if (record.get('status') == 'download-start' || record.get('status') == 'download' || record.get('status') == 'cancel' || record.get('status') == 'install') {
// //
@@ -820,22 +755,29 @@ Ext.onReady(function() {
if (sw == 1) { if (sw == 1) {
uploadForm.getForm().submit({ uploadForm.getForm().submit({
url: "../enterprise/addonsStoreAction", url: "../enterprise/addonsStoreAction",
params: { params: {
action: "importLicense" action: "importLicense"
}, },
waitMsg: _('ID_UPDATING_LICENSE_MSG'), method: 'POST',
success: function (form, o) { waitTitle: _('ID_PLEASE_WAIT'),
Ext.MessageBox.alert(_('ID_INFORMATION'), _('ID_SUCCESSFULLY_UPLOADED'), function () { waitMsg: _('ID_UPDATING_LICENSE_MSG'),
parent.parent.window.location.href = newLocation() success: function (form, o) {
}); Ext.MessageBox.alert(_('ID_INFORMATION'), _('ID_SUCCESSFULLY_UPLOADED'), function () {
}, parent.parent.window.location.href = newLocation();
failure: function (form, o) { });
var dataResponse = eval("(" + o.response.responseText + ")"); //json },
console.log('error', dataResponse); failure: function (form, action) {
if (action.failureType == 'server') {
Ext.MessageBox.alert(_('ID_WARNING'), (dataResponse.errors)? dataResponse.errors : _('ID_WARNING_ERROR_UPDATING')); 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({ var pnlSetup = new Ext.FormPanel({
frame: true, frame: true,
height: 160, height: 160,
@@ -1049,7 +916,7 @@ Ext.onReady(function() {
} }
] ]
}); });
var pnlSupport = new Ext.FormPanel({ var pnlSupport = new Ext.FormPanel({
frame: true, frame: true,
height: 160, height: 160,
@@ -1087,48 +954,42 @@ Ext.onReady(function() {
var licensePanel = new Ext.FormPanel( { var licensePanel = new Ext.FormPanel( {
frame: true, frame: true,
labelWidth: 130,
labelAlign: "right", labelAlign: "right",
defaultType: "displayfield", defaultType: "displayfield",
autoHeight: true,
buttonAlign: 'left',
items: [ items: [
{ {
id: "license_name", id: "license_name",
fieldLabel: _('ID_CURRENT_LICENSE'), fieldLabel: _('ID_CURRENT_LICENSE'),
value: license_name value: license_name
}, },
{ {
id: "license_server", id: "license_server",
fieldLabel: _('ID_LICENSE_SERVER'), fieldLabel: _('ID_LICENSE_SERVER'),
value: license_server value: license_server
}, },
{ {
id: "license_message", id: "license_message",
fieldLabel:_('ID_STATUS'), fieldLabel:_('ID_STATUS'),
hidden: licensed, hidden: licensed,
hideLabel: licensed, hideLabel: licensed,
value: "<font color='red'>"+license_message+"</font>&nbsp;("+license_start_date+"/"+license_end_date+")<br />"+license_user value: "<font color='red'>"+license_message+"</font>&nbsp;("+license_start_date+"/"+license_end_date+")<br />"+license_user
}, },
{ {
id: "license_user", id: "license_user",
fieldLabel: _('ID_ISSUED_TO'), fieldLabel: _('ID_ISSUED_TO'),
value: license_user, value: license_user,
hidden: !licensed, hidden: !licensed,
hideLabel: !licensed hideLabel: !licensed
}, },
{
{ id: "license_expires",
id: "license_expires", fieldLabel: _('ID_EXPIRES'),
fieldLabel: _('ID_EXPIRES'), value: license_expires+'/'+license_span+" ("+license_start_date+" / "+license_end_date+")",
value: license_expires+'/'+license_span+" ("+license_start_date+" / "+license_end_date+")", hidden: !licensed,
hidden: !licensed, hideLabel: !licensed
hideLabel: !licensed }
} ],
], buttons : [
buttons : [
{ {
text: _('ID_IMPORT_LICENSE'), text: _('ID_IMPORT_LICENSE'),
disable: false, disable: false,
@@ -1287,16 +1148,13 @@ Ext.onReady(function() {
items: [btnEnable, btnDisable, btnAdmin] items: [btnEnable, btnDisable, btnAdmin]
}); });
var addonsGrid = new Ext.grid.GridPanel({ var addonsGrid = new Ext.grid.EditorGridPanel({
store: addonsStore, store: addonsStore,
colspan: 2, defaultType: "displayfield",
flex: 1,
padding: 5, padding: 5,
//anchor : '100%',
//height: 300,
autoHeight : true, autoHeight : true,
disabled: !licensed, disabled: !licensed,
columns: [ columns: [
expander, expander,
{ {
id : 'icon-column', id : 'icon-column',
@@ -1417,18 +1275,6 @@ Ext.onReady(function() {
} }
], ],
tbar:[ 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, btnEnable,
btnDisable, btnDisable,
btnAdmin, btnAdmin,
@@ -1698,7 +1544,7 @@ Ext.onReady(function() {
"cellclick": function (grid, rowIndex, columnIndex, e) { "cellclick": function (grid, rowIndex, columnIndex, e) {
var record = grid.getStore().getAt(rowIndex); var record = grid.getStore().getAt(rowIndex);
var fieldName = grid.getColumnModel().getDataIndex(columnIndex); var fieldName = grid.getColumnModel().getDataIndex(columnIndex);
if (fieldName != "status") { if (fieldName != "status") {
return; return;
} }
@@ -1733,7 +1579,11 @@ Ext.onReady(function() {
var tabEnterprise = new Ext.TabPanel({ var tabEnterprise = new Ext.TabPanel({
activeTab: 0, activeTab: 0,
height: 370, height: 370,
defaults:{autoScroll: true}, defaults:{
autoScroll: true,
layout:'form',
frame:true,
},
items:[{ items:[{
title: _('ID_ENTERPRISE_PLUGINS'), title: _('ID_ENTERPRISE_PLUGINS'),
items : addonsGrid items : addonsGrid
@@ -1777,7 +1627,7 @@ Ext.onReady(function() {
); );
addonsGrid.addListener("rowcontextmenu", onMessageMnuContext, this); addonsGrid.addListener("rowcontextmenu", onMessageMnuContext, this);
addonsFeatureGrid.on("rowcontextmenu", addonsFeatureGrid.on("rowcontextmenu",
function (grid, rowIndex, evt) { function (grid, rowIndex, evt) {
var sm = grid.getSelectionModel(); var sm = grid.getSelectionModel();
@@ -1785,7 +1635,7 @@ Ext.onReady(function() {
}, },
this this
); );
addonsFeatureGrid.addListener("rowcontextmenu", onMessageMnuContext, this); addonsFeatureGrid.addListener("rowcontextmenu", onMessageMnuContext, this);
/////// ///////