From 7f77d539ab7b53238c7dd8c8c861148065575a73 Mon Sep 17 00:00:00 2001 From: qronald Date: Wed, 26 Apr 2017 10:21:43 -0400 Subject: [PATCH 1/4] HOR-3103 --- .../ProcessMaker/Services/Api/Project/OutputDocuments.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php index 74af56924..2ade70f25 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php @@ -128,11 +128,6 @@ class OutputDocumentStructure */ public $out_doc_filename; - /** - * @var string {@from body} {@required false} - */ - public $out_doc_template; - /** * @var string {@from body} {@choice TCPDF,HTML2PDF} */ From d77c3cb9b08dac696203626d53c40dd909682b18 Mon Sep 17 00:00:00 2001 From: dheeyi william Date: Wed, 26 Apr 2017 11:28:57 -0400 Subject: [PATCH 2/4] HOR-3114 Change text on help screen that shows up after install --- workflow/engine/templates/services/login_getStarted.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/workflow/engine/templates/services/login_getStarted.html b/workflow/engine/templates/services/login_getStarted.html index baac5bc14..8d685951a 100644 --- a/workflow/engine/templates/services/login_getStarted.html +++ b/workflow/engine/templates/services/login_getStarted.html @@ -95,8 +95,7 @@

Welcome to ProcessMaker


-

This new version features a new process designer based upon the Business Process Management Notation 2 standard. It offers a new form designer with flexible layouts for desktops, tablets and cellphones and a new REST API to remotely access ProcessMaker.

-

To get started, log in using the following credentials. You can change them later:

+

To get started log in using the following credentials:

Username: {name}
Password: {pass}

We suggest you follow our 7 easy videos to automate your workflow. You can see a demo of each step at http://www.processmaker.com/tutorials/

From 3359720ce0505fc3e6a62a2fd8cef4d285dcc7f9 Mon Sep 17 00:00:00 2001 From: qronald Date: Wed, 26 Apr 2017 11:37:25 -0400 Subject: [PATCH 3/4] fix in post and remove OutputDocumentStructure of put --- .../Services/Api/Project/OutputDocuments.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php index 2ade70f25..5e8231b04 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php @@ -78,10 +78,10 @@ class OutputDocuments extends Api * * @param string $prjUid {@min 32} {@max 32} * @param string $outputDocumentUid {@min 32} {@max 32} - * @param OutputDocumentStructure $request_data + * @param array $request_data * */ - public function doPutProjectOutputDocument($prjUid, $outputDocumentUid, OutputDocumentStructure $request_data) + public function doPutProjectOutputDocument($prjUid, $outputDocumentUid, $request_data) { try { $request_data = (array)($request_data); @@ -128,6 +128,11 @@ class OutputDocumentStructure */ public $out_doc_filename; + /** + * @var string {@from body} {@required false} + */ + public $out_doc_template; + /** * @var string {@from body} {@choice TCPDF,HTML2PDF} */ From 754b6c289296ac8a3b6ce34dcba80aabf70539a5 Mon Sep 17 00:00:00 2001 From: dheeyi william Date: Wed, 26 Apr 2017 14:05:07 -0400 Subject: [PATCH 4/4] HOR-3114 Change text on help screen that shows up after install --- workflow/engine/templates/services/login_getStarted.html | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/templates/services/login_getStarted.html b/workflow/engine/templates/services/login_getStarted.html index 8d685951a..243b00080 100644 --- a/workflow/engine/templates/services/login_getStarted.html +++ b/workflow/engine/templates/services/login_getStarted.html @@ -44,6 +44,7 @@ span.cMargLeft { padding-left: 20; } .cell2 { + vertical-align: middle; font-size: 13px; background: #fff; border-right: #fff 1px solid;