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

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-04-02 11:21:03 -04:00
parent eb35c88075 20956565f2
commit 255d5e4a34
2 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build.xml
View File

@@ -136,7 +136,14 @@
</exec> </exec>
</target> </target>
<target name="behat" description="Behaviour tests with Behat"> <target name="prepare-behat" description="Prepare Behat Env.">
<exec executable="${basedir}/../prepare_behat_env">
<arg value="--source-dir" />
<arg value="${basedir}/../" />
</exec>
</target>
<target name="behat" description="Behaviour tests with Behat" depends="prepare-behat">
<exec executable="vendor/behat/behat/bin/behat"> <exec executable="vendor/behat/behat/bin/behat">
<arg value="--format" /> <arg value="--format" />
<arg value="junit,progress" /> <arg value="junit,progress" />

60
workflow/engine/methods/processes/processes_Import_Ajax.php
View File

@@ -23,39 +23,41 @@
*/ */
ini_set( 'max_execution_time', '0' ); ini_set( 'max_execution_time', '0' );
$ext = pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION); if (isset($_FILES["PROCESS_FILENAME"])) {
$ext = pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION);
if ($ext == "pmx") { if ($ext == "pmx") {
$importer = new \ProcessMaker\Importer\XmlImporter(); $importer = new \ProcessMaker\Importer\XmlImporter();
$importer->setSourceFromGlobals("PROCESS_FILENAME"); $importer->setSourceFromGlobals("PROCESS_FILENAME");
$importer->setData("usr_uid", $_SESSION['USER_LOGGED']); $importer->setData("usr_uid", $_SESSION['USER_LOGGED']);
try { try {
$res = $importer->import(); $res = $importer->import();
$result = array( $result = array(
"success" => true, "success" => true,
"catchMessage" => "", "catchMessage" => "",
"ExistProcessInDatabase" => 0, "ExistProcessInDatabase" => 0,
"ExistGroupsInDatabase" => 0, "ExistGroupsInDatabase" => 0,
"sNewProUid" => $res[0]["new_uid"], "sNewProUid" => $res[0]["new_uid"],
"project_type" => "bpmn" "project_type" => "bpmn"
); );
} catch (Exception $e) { } catch (Exception $e) {
$result = array( $result = array(
"success" => true, "success" => true,
"catchMessage" => "", //$e->getMessage(), "catchMessage" => "", //$e->getMessage(),
"ExistProcessInDatabase" => 1, "ExistProcessInDatabase" => 1,
"ExistGroupsInDatabase" => 0, "ExistGroupsInDatabase" => 0,
"groupBeforeAccion" => "uploadFileNewProcess", "groupBeforeAccion" => "uploadFileNewProcess",
"sNewProUid" => "63626727053359dabb8fee8019503780", "sNewProUid" => "63626727053359dabb8fee8019503780",
"proFileName" => $_FILES['PROCESS_FILENAME']['name'], "proFileName" => $_FILES['PROCESS_FILENAME']['name'],
"project_type" => "bpmn" "project_type" => "bpmn"
); );
}
echo json_encode($result);
exit(0);
} }
echo json_encode($result);
exit(0);
} }
function reservedWordsSqlValidate ($data) function reservedWordsSqlValidate ($data)