fernando/luos
1
0
Fork 0
Code Releases Activity

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

Browse Source
This commit is contained in:
Omar
2014-02-28 15:53:07 -04:00
parent 4d66f3c46d 20d0231d81
commit ee30193615
7 changed files with 132 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-vendor.php
View File

@@ -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) {

2
features/backend/activity/negative_tests_activity.feature
View File

@@ -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 |
| 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 |

23
gulliver/system/class.controller.php
View File

@@ -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();

141
gulliver/templates/controller.exception.tpl
View File

@@ -1,55 +1,100 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>Server Error :: </title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="robots" content="noindex,nofollow" />
<title>Whoops, looks like something went wrong.</title>
<style>
{literal}
/* Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.com/yui/license.html */
html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;}
html { background: #eee; padding: 10px }
body { font: 11px Verdana, Arial, sans-serif; color: #333 }
img { border: 0; }
.clear { clear:both; height:0; font-size:0; line-height:0; }
.clear_fix:after { display:block; height:0; clear:both; visibility:hidden; }
.clear_fix { display:inline-block; }
* html .clear_fix { height:1%; }
.clear_fix { display:block; }
#content { width:970px; margin:0 auto; }
.exceptionreset, .exceptionreset .block { margin: auto }
.exceptionreset abbr { border-bottom: 1px dotted #000; cursor: help; }
.exceptionreset p { font-size:14px; line-height:20px; color:#868686; padding-bottom:20px }
.exceptionreset strong { font-weight:bold; }
.exceptionreset a { color:#6c6159; }
.exceptionreset a img { border:none; }
.exceptionreset a:hover { text-decoration:underline; }
.exceptionreset em { font-style:italic; }
.exceptionreset h1, .exceptionreset h2 { font: 20px Georgia, "Times New Roman", Times, serif }
.exceptionreset h2 span { background-color: #fff; color: #333; padding: 6px; float: left; margin-right: 10px; }
.exceptionreset .traces li { font-size:12px; padding: 2px 4px; list-style-type:decimal; margin-left:20px; }
.exceptionreset .block { background-color:#FFFFFF; padding:10px 28px; margin-bottom:20px;
-webkit-border-bottom-right-radius: 16px;
-webkit-border-bottom-left-radius: 16px;
-moz-border-radius-bottomright: 16px;
-moz-border-radius-bottomleft: 16px;
border-bottom-right-radius: 16px;
border-bottom-left-radius: 16px;
border-bottom:1px solid #ccc;
border-right:1px solid #ccc;
border-left:1px solid #ccc;
}
.exceptionreset .block_exception { background-color:#ddd; color: #333; padding:20px;
-webkit-border-top-left-radius: 16px;
-webkit-border-top-right-radius: 16px;
-moz-border-radius-topleft: 16px;
-moz-border-radius-topright: 16px;
border-top-left-radius: 16px;
border-top-right-radius: 16px;
border-top:1px solid #ccc;
border-right:1px solid #ccc;
border-left:1px solid #ccc;
}
.exceptionreset li a { background:none; color:#868686; text-decoration:none; }
.exceptionreset li a:hover { background:none; color:#313131; text-decoration:underline; }
.exceptionreset ol { padding: 10px 0; }
.exceptionreset h1 { background-color:#FFFFFF; padding: 15px 28px; margin-bottom: 20px;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
border: 1px solid #ccc;
}
{/literal}
</style>
</head>
<style>
.box {
-moz-border-radius:6px; /* Rounded edges in Firefox */
color :#000;
border-style:solid;
border-width:1px;
border-color:#000;
font :normal 8pt Tahoma,sans-serif,MiscFixed;
text-decoration:none;
padding:0 20px;
vertical-align:middle;
font-weight: bold;
background-color:#DBDBDB;
}
</style>
<body>
<div class='box'>
<br />
<br />
<table width="70%" border="0" align="center" cellpadding="0" cellspacing="0" class="mainCopy">
<tr>
<td width="15%" align="left" scope="col">
<span class="mxbOnlineTextBlue">CONTROLLER EXCEPTION</span><br />
<hr/>
{message}<br /><br />
Controller: {controller}<br />
File: {file}<br />
Line: {line}
<br />
<br />
<table>
<tr><td><small><pre>{trace}</pre></small></td></tr>
</table>
</td>
</tr>
</table>
<div id="content" class="exceptionreset">
<h1>{$controller} {$title}</h1>
<div class="block_exception clear_fix">
<h2>
<abbr title="RuntimeException">{$exceptionClass}</abbr>: {$message}
</h2>
</div>
<div class="block">
Controller: {$controller}<br />
File: {$file}<br />
Line: {$line}
<ol class="traces list_exception">
{foreach from=$trace item=line}
{if $line.class}
<li>At <b>{$line.class}{$line.type}</b><i>{$line.function}()</i><br/>in {$line.file} line {$line.line}</li>
{else}
<li>At {$line.function}() in {$line.file} line {$line.line}</li>
{/if}
{/foreach}
</ol>
</div>
</div>
</body>
</html>

25
update
View File

@@ -2,19 +2,19 @@
echo "<h1>Michelangelo Update</h1><h2>Changelog Processmaker</h2><code>" > 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 "</code><br><h2>Changelog pmUI</h2><br><code>" >> ../../../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 "</code><br><h2>Changelog MichelangeloFE</h2><br><code>" >> ../../../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/<br>/g' temp.txt > workflow/public_html/build-log.html
cp workflow/public_html/build-log.html temp.txt
sed -re 's#\[0;35;35m#<span style="color:saddlebrown;">#g' temp.txt > workflow/public_html/build-log.html
cp workflow/public_html/build-log.html temp.txt
sed -re 's#\[1;33;34m#<span style="color:darkblue;">#g' temp.txt > workflow/public_html/build-log.html
cp workflow/public_html/build-log.html temp.txt
sed -re 's#\[0;35;32m#<span style="color:green;">#g' temp.txt > workflow/public_html/build-log.html
cp workflow/public_html/build-log.html temp.txt
sed -re 's#\[31m\[32m#</span style="color:brown;">#g' temp.txt > workflow/public_html/build-log.html
cp workflow/public_html/build-log.html temp.txt
sed -re 's#\[0m#</span>#g' temp.txt > workflow/public_html/build-log.html
cp workflow/public_html/build-log.html temp.txt
sed -re 's#Author:(.*)\n#<span>xxxx(1)</span>#g' temp.txt > workflow/public_html/build-log.html
echo "update executed succesfully, check the log in http://<server>/build-log.html "

4
workflow/engine/controllers/designer.php
View File

@@ -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);

3
workflow/engine/src/BusinessModel/Step.php
View File

@@ -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}\"")));
}
}