diff --git a/build-vendor.php b/build-vendor.php index 8ce968286..d391f103e 100644 --- a/build-vendor.php +++ b/build-vendor.php @@ -44,6 +44,7 @@ $projects = array( 'colosa/pmUI' ); + out("build-vendor.php", 'purple'); @@ -54,6 +55,7 @@ out(" mode", 'purple'); foreach ($projects as $project) { echo PHP_EOL; out("=> Building project: ", 'info', false); + $output = array(); echo $project.' '.PHP_EOL; chdir($vendorDir.DS.$project); if ($debug) { diff --git a/features/backend/activity/negative_tests_activity.feature b/features/backend/activity/negative_tests_activity.feature index 71c71bb53..66c88c5a4 100644 --- a/features/backend/activity/negative_tests_activity.feature +++ b/features/backend/activity/negative_tests_activity.feature @@ -104,4 +104,4 @@ Scenario Outline: Update the Definition of a Activity and the check if the value | Invalid tas_type_day | 95655319552a5c790b69a04054667879 | Task2 | Case Description | @@SYS_NEXT_USER_TO_BE_ASSIGNED | template.html | TRUE | BALANCED | @@USER_LOGGED | @@GROUP_UID | 1 | 2 | DAYS | | FALSE | 2 | DAYS | 6 | | ADHOC | Case Title | Case Description | FALSE | Titulo de Notificacion 1| template | Esta es una Notificacion | template.html | tas_type_day | | Invalid tas_type | 63843886052a5cc066e4c04056414372 | Task3 | Case Description | @@SYS_NEXT_USER_TO_BE_ASSIGNED | template.html | TRUE | BALANCED | @@USER_LOGGED | @@GROUP_UID | 1 | 2 | DAYS | | FALSE | 2 | DAYS | 2 | | INPUT | Case Title | Case Description | FALSE | Titulo de Notificacion 1| template | Esta es una Notificacion | template.html | tas_type | | Invalid tas_send_last_email | 97192372152a5c78f04a794095806311 | Task1 | Case Description | @@SYS_NEXT_USER_TO_BE_ASSIGNED | template.html | TRUE | BALANCED | @@USER_LOGGED | @@GROUP_UID | 1 | 2 | DAYS | | FALSE | 2 | DAYS | 2 | | ADHOC | Case Title | Case Description | INPUT | Titulo de Notificacion 1| template | Esta es una Notificacion | template.html | tas_send_last_email | - | Invalid tas_def_message_type | 95655319552a5c790b69a04054667879 | Task2 | Case Description | @@SYS_NEXT_USER_TO_BE_ASSIGNED | template.html | TRUE | BALANCED | @@USER_LOGGED | @@GROUP_UID | 1 | 2 | DAYS | | FALSE | 2 | DAYS | 2 | | ADHOC | Case Title | Case Description | FALSE | Titulo de Notificacion 1| INPUT | Esta es una Notificacion | template.html | tas_def_message_type | \ No newline at end of file + | Invalid tas_def_message_type | 95655319552a5c790b69a04054667879 | Task2 | Case Description | @@SYS_NEXT_USER_TO_BE_ASSIGNED | template.html | TRUE | BALANCED | @@USER_LOGGED | @@GROUP_UID | 1 | 2 | DAYS | | FALSE | 2 | DAYS | 2 | | ADHOC | Case Title | Case Description | TRUE | Titulo de Notificacion 1| INPUT | Esta es una Notificacion | template.html | tas_def_message_type | \ No newline at end of file diff --git a/gulliver/system/class.controller.php b/gulliver/system/class.controller.php index f61e25eaf..3e6eccf4d 100755 --- a/gulliver/system/class.controller.php +++ b/gulliver/system/class.controller.php @@ -129,20 +129,17 @@ class Controller print G::json_encode( $result ); } } catch (Exception $e) { + $result = new StdClass(); if ($this->responseType != 'json') { - $result->exception->class = get_class( $e ); - $result->exception->code = $e->getCode(); - - $template = new TemplatePower( PATH_TEMPLATE . 'controller.exception.tpl' ); - $template->prepare(); - $template->assign( 'controller', (function_exists( 'get_called_class' ) ? get_called_class() : 'Controller') ); - $template->assign( 'message', $e->getMessage() ); - $template->assign( 'file', $e->getFile() ); - $template->assign( 'line', $e->getLine() ); - $template->assign( 'trace', $e->getTraceAsString() ); - - echo $template->getOutputContent(); - + Bootstrap::renderTemplate('controller.exception.tpl', array( + 'title' => 'Controller Exception', + 'message' => nl2br($e->getMessage()), + 'controller' => (function_exists( 'get_called_class' ) ? get_called_class() : 'Controller'), + 'exceptionClass' => get_class($e), + 'file' => $e->getFile(), + 'line' => $e->getLine(), + 'trace' => $e->getTrace() + )); } else { $result->success = false; $result->msg = $e->getMessage(); diff --git a/gulliver/templates/controller.exception.tpl b/gulliver/templates/controller.exception.tpl index 3e77268e5..37eb9a27b 100755 --- a/gulliver/templates/controller.exception.tpl +++ b/gulliver/templates/controller.exception.tpl @@ -1,55 +1,100 @@ - - + + - -Server Error :: + + + Whoops, looks like something went wrong. + - - -
- -
-
- - - - -
- CONTROLLER EXCEPTION
-
- {message}

- Controller: {controller}
- File: {file}
- Line: {line} -
-
- - - - 
{trace}
-
+
+

{$controller} {$title}

+
+

+ {$exceptionClass}: {$message} +

+
+
+ Controller: {$controller}
+ File: {$file}
+ Line: {$line} +
    + {foreach from=$trace item=line} + {if $line.class} +
  1. At {$line.class}{$line.type}{$line.function}()
    in {$line.file} line {$line.line}
    2. + {else} +
  2. At {$line.function}() in {$line.file} line {$line.line}
    3. + {/if} + {/foreach} +
+
- \ No newline at end of file + + + + + + + + + + diff --git a/update b/update index 62821f1a9..08ff44370 100755 --- a/update +++ b/update @@ -2,19 +2,19 @@ echo "

Michelangelo Update

Changelog Processmaker

" > temp.txt git pull -git log -n 20 --relative-date --graph --format=short >> temp.txt +git log -n 30 --relative-date --graph --format=medium --no-merges >> temp.txt cd vendor/colosa/pmUI echo "

Changelog pmUI


" >> ../../../temp.txt git pull -git log -n 20 --relative-date --graph --format=short >> ../../../temp.txt +git log -n 30 --relative-date --graph --format=medium --no-merges >> ../../../temp.txt cd ../MichelangeloFE echo "

Changelog MichelangeloFE


" >> ../../../temp.txt git pull -git log -n 20 --relative-date --graph --format=short >> ../../../temp.txt +git log -n 30 --relative-date --graph --format=medium --no-merges >> ../../../temp.txt cd ../../../ @@ -23,4 +23,23 @@ php build-vendor.php >> temp.txt sed ':a;N;$!ba;s/\n/
/g' temp.txt > workflow/public_html/build-log.html +cp workflow/public_html/build-log.html temp.txt +sed -re 's#\[0;35;35m##g' temp.txt > workflow/public_html/build-log.html + +cp workflow/public_html/build-log.html temp.txt +sed -re 's#\[1;33;34m##g' temp.txt > workflow/public_html/build-log.html + +cp workflow/public_html/build-log.html temp.txt +sed -re 's#\[0;35;32m##g' temp.txt > workflow/public_html/build-log.html + + +cp workflow/public_html/build-log.html temp.txt +sed -re 's#\[31m\[32m##g' temp.txt > workflow/public_html/build-log.html + +cp workflow/public_html/build-log.html temp.txt +sed -re 's#\[0m##g' temp.txt > workflow/public_html/build-log.html + +cp workflow/public_html/build-log.html temp.txt +sed -re 's#Author:(.*)\n#xxxx(1)#g' temp.txt > workflow/public_html/build-log.html + echo "update executed succesfully, check the log in http:///build-log.html " diff --git a/workflow/engine/controllers/designer.php b/workflow/engine/controllers/designer.php index 381441769..2f247588e 100644 --- a/workflow/engine/controllers/designer.php +++ b/workflow/engine/controllers/designer.php @@ -39,10 +39,10 @@ class Designer extends Controller if (System::isDebugMode()) { if (! file_exists(PATH_HTML . "lib-dev/pmUI/build.cache")) { - throw new Exception("Error: Development JS Files were are not generated!, please execute: \$rake pmBuildDebug in pmUI project"); + throw new RuntimeException("Development JS Files were are not generated!.\nPlease execute: \$>rake pmBuildDebug in pmUI project"); } if (! file_exists(PATH_HTML . "lib-dev/mafe/build.cache")) { - throw new Exception("Error: Development JS Files were are not generated!, please execute: \$rake pmBuildDebug in MichelangeloFE project"); + throw new RuntimeException("Development JS Files were are not generated!.\nPlease execute: \$>rake pmBuildDebug in MichelangeloFE project"); } $mafeFiles = file(PATH_HTML . "lib-dev/mafe/build.cache", FILE_IGNORE_NEW_LINES); diff --git a/workflow/engine/src/BusinessModel/Step.php b/workflow/engine/src/BusinessModel/Step.php index 1261c8379..472462280 100644 --- a/workflow/engine/src/BusinessModel/Step.php +++ b/workflow/engine/src/BusinessModel/Step.php @@ -170,9 +170,8 @@ class Step */ public function throwExceptionIfHaveInvalidValueInTypeObj($stepTypeObj) { - if (!in_array($stepTypeObj, array("DYNAFORM", "INPUT_DOCUMENT", "OUTPUT_DOCUMENT"))) { + if (!in_array($stepTypeObj, array("DYNAFORM", "INPUT_DOCUMENT", "OUTPUT_DOCUMENT", "EXTERNAL"))) { $field = $this->arrayParamException["stepTypeObj"]; - throw (new \Exception(str_replace(array("{0}"), array($field), "Invalid value specified for \"{0}\""))); } }