fernando/luos
1
0
Fork 0
Code Releases Activity

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

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2014-04-21 16:36:35 -04:00
parent c24c04e8fb 14a17ac244
commit e11db1ea54
6 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
features/backend/admin_setup/departments/basic_sequence_department.feature
View File

@@ -38,7 +38,7 @@ Background:
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "array"
And the response has 6 record
And the response has 7 record
Scenario: Create a new department in the workspace

1
features/backend/application_cases/case_actions/negative_tests_cases_actions.feature
View File

@@ -117,6 +117,7 @@ Scenario Outline: Create a case, derivate and cancel. then try do pause or route
Then the response status code should be 400
And the response status message should have the following text "<error_message_pause>"
#Delete case
And PUT this data:
"""
{

2
features/backend/application_cases/input_documents_case/basic_sequence_input_document_case.feature
View File

@@ -13,7 +13,7 @@ Scenario: Returns a list of the uploaded documents for a given case
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "array"
And the response has 9 records
And the response has 10 records
Scenario: Returns an uploaded documents for a given case

2
features/backend/application_cases/output_document_case/basic_sequence_output_document_case.feature
View File

@@ -16,7 +16,7 @@ Scenario: Returns a list of the generated documents for a given cases
And the response has 1 records
Scenario: Returns an generated document for a given case
Scenario: Returns a generated document for a given case
Given I request "cases/33125846153383cecdf64f1079330191/output-document/75468909953383d0bc42f96046736849"
Then the response status code should be 200
And the response charset is "UTF-8"

4
workflow/engine/classes/class.pmScript.php
View File

@@ -154,7 +154,9 @@ class PMScript
if (!defined("T_ML_COMMENT")) {
define("T_ML_COMMENT", T_COMMENT);
} else {
define("T_DOC_COMMENT", T_ML_COMMENT);
if (!defined("T_DOC_COMMENT")) {
define("T_DOC_COMMENT", T_ML_COMMENT);
}
}
$script = "<?php " . $sScript;

2
workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php
View File

@@ -269,7 +269,7 @@ class OutputDocument
}
}
$g->sessionVarRestore();
$response = $this->getCasesOutputDocument($applicationUid, $userUid, $sDocUID);
$response = $this->getCasesOutputDocument($applicationUid, $userUid, $aFields['APP_DOC_UID']);
return $response;
} catch (\Exception $e) {
throw $e;