fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-1165

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2015-01-08 14:21:04 -04:00
parent 42668f52ae c3c2c12c63
commit 19f530cf09
3 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Rakefile
View File

@@ -230,8 +230,7 @@ def buildMafe(homeDir, targetDir, mode)
"#{homeDir}/build/js/designer.js" => "#{mafeDir}/designer.min.js", "#{homeDir}/build/js/designer.js" => "#{mafeDir}/designer.min.js",
"#{homeDir}/build/js/mafe.js" => "#{mafeDir}/mafe.min.js", "#{homeDir}/build/js/mafe.js" => "#{mafeDir}/mafe.min.js",
"#{homeDir}/build/css/mafe.css" => "#{mafeDir}/mafe.min.css", "#{homeDir}/build/css/mafe.css" => "#{mafeDir}/mafe.min.css",
"#{homeDir}/img/*.*" => "#{imgTargetDir}", "#{homeDir}/img/*.*" => "#{imgTargetDir}"
"#{homeDir}/srcForm/img/*.*" => "#{imgTargetDir}"
}) })
puts "\nCopying lib files into: #{jsTargetDir}".bold puts "\nCopying lib files into: #{jsTargetDir}".bold

2
gulliver/bin/tasks/pakeGulliver.php
View File

@@ -69,8 +69,10 @@ pake_task('workspace-backup', 'project_exists');
pake_desc("restore a previously backed-up workspace\n args: [-o|--overwrite] <filename> <workspace>"); pake_desc("restore a previously backed-up workspace\n args: [-o|--overwrite] <filename> <workspace>");
pake_task('workspace-restore', 'project_exists'); pake_task('workspace-restore', 'project_exists');
/*----------------------------------********---------------------------------*/
pake_desc("check standard code\n args: <directory>"); pake_desc("check standard code\n args: <directory>");
pake_task('check-standard-code', 'project_exists' ); pake_task('check-standard-code', 'project_exists' );
/*----------------------------------********---------------------------------*/
/** /**
* Function run_version * Function run_version

15
workflow/engine/js/cases/core/cases_Step_Pmdynaform.js
View File

@@ -46,21 +46,6 @@ $(window).load(function () {
var form = document.getElementsByTagName("form")[0]; var form = document.getElementsByTagName("form")[0];
var el = form.elements;
var dt = data.items[0].items;
for (var i = 0; i < dt.length; i++) {
var dr = dt[i];
for (var j = 0; j < dr.length; j++) {
if (dr[j].name) {
for (var k = 0; k < el.length; k++) {
if (el[k].name === dr[j].name) {
el[k].name = "form[" + dr[j].name + "]";
}
}
}
}
}
var type = document.createElement("input"); var type = document.createElement("input");
type.type = "hidden"; type.type = "hidden";
type.name = "TYPE"; type.name = "TYPE";