fernando/luos
1
0
Fork 0
Code Releases Activity

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

Browse Source
This commit is contained in:
Victor Saisa Lopez
2014-02-25 13:45:49 -04:00
parent 322fae66fc 205f4a461f
commit 6a7eb191a4
8 changed files with 54 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
build-vendor.php
View File

@@ -32,7 +32,6 @@ if (in_array('--no-ansi', $argv)) {
$vendorDir = dirname(__FILE__) . DS . 'vendor';
if (! is_dir($vendorDir )) {
echo "Vendor directory is missing!" . PHP_EOL;
exit();
@@ -43,16 +42,38 @@ $projects = array(
'colosa/pmUI'
);
out("build-vendor.php", 'purple');
out("generating files for ", 'purple', false);
out( $debug ? 'debug' : 'production', 'success', false);
out(" mode", 'purple');
foreach ($projects as $project) {
echo PHP_EOL;
out("=> Building project: ", 'info', false);
echo $project.' '.PHP_EOL;
chdir($vendorDir.DS.$project);
if ($debug)
echo `rake pmBuildDebug`;
else
echo `rake pmBuild`;
out("Completed!", 'success');
if ($debug) {
exec ('rake pmBuildDebug', $output, $exitCode );
} else {
exec ('rake pmBuild', $output, $exitCode );
}
if ($exitCode) {
out("$project executed with errors!", 'error');
foreach ($output as $line) {
print "$line\n";
}
echo PHP_EOL;
die;
} else {
foreach ($output as $line) {
print "$line\n";
}
out("$project completed", 'success');
echo PHP_EOL;
}
}
echo PHP_EOL;
@@ -70,8 +91,9 @@ function out($text, $color = null, $newLine = true)
{
$styles = array(
'success' => "\033[0;35;32m%s\033[0m",
'error' => "\033[0;35;31m%s\033[0m",
'info' => "\033[1;33;34m%s\033[0m"
'error' => "\033[0;35;31m%s\033[0m",
'purple' => "\033[0;35;35m%s\033[0m",
'info' => "\033[1;33;34m%s\033[0m"
);
$format = '%s';
@@ -85,4 +107,4 @@ function out($text, $color = null, $newLine = true)
}
printf($format, $text);
}
}

2
features/backend/files_manager/basic_sequence_files_manager.feature
View File

@@ -86,7 +86,7 @@ Feature: Files Manager Resources
#Para que funcione este test, debe existir el archivo que se quiere subir
Scenario: Post files
Given POST I want to upload the file "/home/daniel/test.txt" to path "public". Url to create prf_uid "project/1265557095225ff5c688f46031700471/file-manager" and updload "project/1265557095225ff5c688f46031700471/file-manager/upload"
Given POST I want to upload the file "/home/daniel/test.txt" to path "public". Url to create prf_uid "project/1265557095225ff5c688f46031700471/file-manager" and updload "project/1265557095225ff5c688f46031700471/file-manager"
Scenario: Delete file
Given that I want to delete a "public/test.txt"

2
features/backend/process_supervisor/main_tests_supervisor.feature
View File

@@ -209,7 +209,7 @@ Requirements:
Given POST this data:
"""
{
"dyn_uid": "<92562207752ceef36c7d874048012431>"
"dyn_uid": "92562207752ceef36c7d874048012431"
}
"""
And I request "project/85794888452ceeef3675164057928956/process-supervisor/dynaform"

14
features/bootstrap/RestContext.php
View File

@@ -1329,18 +1329,22 @@ class RestContext extends BehatContext
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL,$postUrl);
curl_setopt($ch, CURLOPT_HTTPHEADER,$headr);
curl_setopt($ch, CURLOPT_POSTFIELDS, array('prf_filename'=>$sfile, "prf_path" => $path, "prf_content" => ""));
curl_setopt($ch, CURLOPT_POSTFIELDS, array('prf_filename'=>$sfile, "prf_path" => $path, "prf_content" => NULL));
curl_setopt($ch, CURLOPT_USERAGENT,'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.13) Gecko/20080311 Firefox/2.0.0.13');
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
$postResult = curl_exec($ch);
curl_close($ch);
$aResult = explode(",",$postResult);
$aFileUid = explode(":",$aResult[0]);
$prfUid = trim(str_replace('"','',$aFileUid[1]));
$postResult = (array)json_decode($postResult);
if (sizeof($postResult) > 2) {
$prfUid = $postResult["prf_uid"];
} else {
var_dump($postResult["error"]);
}
$url = $url.$prfUid."/upload";
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL,$url);
curl_setopt($ch, CURLOPT_HTTPHEADER,$headr);
curl_setopt($ch, CURLOPT_POSTFIELDS, array('my_file'=>'@'.$prfFile, 'prf_uid' => $prfUid));
curl_setopt($ch, CURLOPT_POSTFIELDS, array('prf_file'=>'@'.$prfFile));
curl_setopt($ch, CURLOPT_USERAGENT,'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.13) Gecko/20080311 Firefox/2.0.0.13');
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
$postResult = curl_exec($ch);

4
workflow/engine/methods/dynaforms/fields_Ajax.php
View File

@@ -88,7 +88,7 @@ $r = 0;
foreach ($dependentFields as $d) {
$sendContent[$r] = new stdclass();
$sendContent[$r]->name = $d;
$sendContent[$r]->content = null;
$sendContent[$r]->content = new stdclass();
foreach ($G_FORM->fields[$d] as $attribute => $value) {
switch ($attribute) {
case 'type':
@@ -108,7 +108,7 @@ function toJSArray ($array)
{
$result = array ();
foreach ($array as $k => $v) {
$o = null;
$o = new stdclass();
$o->key = $k;
$o->value = $v;
$result[] = $o;

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

@@ -336,7 +336,8 @@ class FilesManager
'prf_type' => $oProcessFiles->getPrfType(),
'prf_editable' => $sEditable,
'prf_create_date' => $oProcessFiles->getPrfCreateDate(),
'prf_update_date' => $oProcessFiles->getPrfUpdateDate());
'prf_update_date' => $oProcessFiles->getPrfUpdateDate(),
'prf_content' => $content);
return $oProcessFile;
} catch (Exception $e) {
throw $e;

5
workflow/engine/src/Services/Api/ProcessMaker/Project/FilesManager.php
View File

@@ -143,7 +143,10 @@ class ProcessFilesManagerStructure
* @var string {@from body}
*/
public $prf_path;
/**
* @var string {@from body}
*/
public $prf_content;
}

6
workflow/engine/templates/designer/index.html
View File

@@ -69,12 +69,14 @@
<script type="text/javascript" src="/js/codemirror/lib/codemirror.js"></script>
<link rel="stylesheet" type="text/css" href="/js/codemirror/lib/codemirror.css"/>
<script type="text/javascript" src="/js/codemirror/mode/javascript/javascript.js"></script>
<script type="text/javascript" src="/js/codemirror/addon/edit/matchbrackets.js"></script>
<script type="text/javascript" src="/js/codemirror/mode/htmlmixed/htmlmixed.js"></script>
<script type="text/javascript" src="/js/codemirror/mode/xml/xml.js"></script>
<script type="text/javascript" src="/js/codemirror/mode/css/css.js"></script>
<script type="text/javascript" src="/js/codemirror/mode/clike/clike.js"></script>
<script type="text/javascript" src="/js/codemirror/mode/php/php.js"></script>
<!--
<link rel="stylesheet" type="text/css" href="/js/codemirror/doc/docs.css"/>
!-->