From fc93b917cfe24aaaeaf97db69a2505db7f365dca Mon Sep 17 00:00:00 2001 From: Wendy Nestor Date: Mon, 21 Apr 2014 10:50:35 -0400 Subject: [PATCH 1/4] Modificaciones a los features department, input document y output document --- .../admin_setup/departments/basic_sequence_department.feature | 2 +- .../basic_sequence_input_document_case.feature | 2 +- .../basic_sequence_output_document_case.feature | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/features/backend/admin_setup/departments/basic_sequence_department.feature b/features/backend/admin_setup/departments/basic_sequence_department.feature index f7a02b42d..74d23488b 100644 --- a/features/backend/admin_setup/departments/basic_sequence_department.feature +++ b/features/backend/admin_setup/departments/basic_sequence_department.feature @@ -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 diff --git a/features/backend/application_cases/input_documents_case/basic_sequence_input_document_case.feature b/features/backend/application_cases/input_documents_case/basic_sequence_input_document_case.feature index b48aedc6e..1d852279c 100644 --- a/features/backend/application_cases/input_documents_case/basic_sequence_input_document_case.feature +++ b/features/backend/application_cases/input_documents_case/basic_sequence_input_document_case.feature @@ -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 diff --git a/features/backend/application_cases/output_document_case/basic_sequence_output_document_case.feature b/features/backend/application_cases/output_document_case/basic_sequence_output_document_case.feature index 136797aa4..8c1b095e6 100644 --- a/features/backend/application_cases/output_document_case/basic_sequence_output_document_case.feature +++ b/features/backend/application_cases/output_document_case/basic_sequence_output_document_case.feature @@ -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" From 7bc20a109eac5a21478ec34685bca478acbaf5bd Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Mon, 21 Apr 2014 11:48:27 -0400 Subject: [PATCH 2/4] Se ajusta retorno en el metodo post de output documents. --- .../src/ProcessMaker/BusinessModel/Cases/OutputDocument.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php index f21057f0d..94d472c7d 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php @@ -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; From 4ebf16d709f0a4d9ac79dc917e19c9e7b13e7cde Mon Sep 17 00:00:00 2001 From: Wendy Nestor Date: Mon, 21 Apr 2014 15:11:20 -0400 Subject: [PATCH 3/4] modificacion al feature negative case actions --- .../case_actions/negative_tests_cases_actions.feature | 1 + 1 file changed, 1 insertion(+) diff --git a/features/backend/application_cases/case_actions/negative_tests_cases_actions.feature b/features/backend/application_cases/case_actions/negative_tests_cases_actions.feature index 78a30b290..0858a1365 100644 --- a/features/backend/application_cases/case_actions/negative_tests_cases_actions.feature +++ b/features/backend/application_cases/case_actions/negative_tests_cases_actions.feature @@ -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 "" + #Delete case And PUT this data: """ { From 8019fb6e671ad21317492d9f7d4b621b63e82f8c Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Mon, 21 Apr 2014 15:50:14 -0400 Subject: [PATCH 4/4] Se ajusta class.pmScript incluyendo una validacion para definir "T_DOC_COMMENT". --- workflow/engine/classes/class.pmScript.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.pmScript.php b/workflow/engine/classes/class.pmScript.php index 8feced918..adb842dc7 100644 --- a/workflow/engine/classes/class.pmScript.php +++ b/workflow/engine/classes/class.pmScript.php @@ -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 = "