fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in victorsl/processmaker/PM-1635 (pull request #1752)

Browse Source 
PM-1635 "PM-1635 y PM-1154" SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2015-03-23 20:54:17 -04:00
parent c164094331 5850759859
commit 4710fae568
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
workflow/engine/methods/processes/mainInit.php
View File

@@ -29,11 +29,24 @@ $RBAC->requirePermissions( 'PM_FACTORY' );
G::loadClass( 'configuration' ); G::loadClass( 'configuration' );
$conf = new Configurations(); $conf = new Configurations();
if (preg_match("/^([\d\.]+).*$/", System::getVersion(), $arrayMatch)) {
$pmVersion = $arrayMatch[1];
} else {
$pmVersion = ""; //Branch master
}
$arrayPmFileExtension = array("pm", "pmx", "bpmn");
if ($pmVersion != "") {
$arrayPmFileExtension = (version_compare($pmVersion . "", "3", ">="))? $arrayPmFileExtension : array("pm");
}
$oHeadPublisher->addExtJsScript( 'processes/main', true ); //adding a javascript file .js $oHeadPublisher->addExtJsScript( 'processes/main', true ); //adding a javascript file .js
$oHeadPublisher->addContent( 'processes/main' ); //adding a html file .html. $oHeadPublisher->addContent( 'processes/main' ); //adding a html file .html.
$partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false; $partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
$oHeadPublisher->assign( 'PARTNER_FLAG', $partnerFlag ); $oHeadPublisher->assign( 'PARTNER_FLAG', $partnerFlag );
$oHeadPublisher->assign( 'pageSize', $conf->getEnvSetting( 'casesListRowNumber' ) ); $oHeadPublisher->assign( 'pageSize', $conf->getEnvSetting( 'casesListRowNumber' ) );
$oHeadPublisher->assign("arrayPmFileExtension", $arrayPmFileExtension);
G::RenderPage( 'publish', 'extJs' ); G::RenderPage( 'publish', 'extJs' );

2
workflow/engine/templates/processes/main.js
View File

@@ -1213,7 +1213,7 @@ importProcess = function()
handler : function(){ handler : function(){
var arrayMatch = []; var arrayMatch = [];
if ((arrayMatch = eval("/^.+\.(pm|pmx|bpmn)$/i").exec(Ext.getCmp("form-file").getValue()))) { if ((arrayMatch = eval("/^.+\.(" + arrayPmFileExtension.join("|") + ")$/i").exec(Ext.getCmp("form-file").getValue()))) {
var fileExtension = arrayMatch[1]; var fileExtension = arrayMatch[1];
switch (fileExtension) { switch (fileExtension) {