fernando/luos
1
0
Fork 0
Code Releases Activity

Merged master into dashboards2

Browse Source
This commit is contained in:
Dante Loayza
2015-04-16 17:04:12 -04:00
parent ec7a128831 7a3f41bcaf
commit dd6312a829
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Rakefile
View File

@@ -386,6 +386,7 @@ def getJsIncludeFiles
"gulliver/js/codemirror/addon/hint/show-hint.js", "gulliver/js/codemirror/addon/hint/show-hint.js",
"gulliver/js/codemirror/addon/hint/javascript-hint.js", "gulliver/js/codemirror/addon/hint/javascript-hint.js",
"gulliver/js/codemirror/addon/hint/sql-hint.js", "gulliver/js/codemirror/addon/hint/sql-hint.js",
"gulliver/js/codemirror/addon/hint/php-hint.js",
"gulliver/js/codemirror/mode/javascript/javascript.js", "gulliver/js/codemirror/mode/javascript/javascript.js",
"gulliver/js/codemirror/addon/edit/matchbrackets.js", "gulliver/js/codemirror/addon/edit/matchbrackets.js",
"gulliver/js/codemirror/mode/htmlmixed/htmlmixed.js", "gulliver/js/codemirror/mode/htmlmixed/htmlmixed.js",

2
workflow/engine/src/ProcessMaker/BusinessModel/Task.php
View File

@@ -321,7 +321,7 @@ class Task
} }
//Validating TAS_TRANSFER_FLY value //Validating TAS_TRANSFER_FLY value
if ($arrayProperty["TAS_TRANSFER_FLY"] == "TRUE") { if ($arrayProperty["TAS_TRANSFER_FLY"] == "FALSE") {
if (!isset($arrayProperty["TAS_DURATION"])) { if (!isset($arrayProperty["TAS_DURATION"])) {
throw (new \Exception("Invalid value specified for 'tas_duration'")); throw (new \Exception("Invalid value specified for 'tas_duration'"));
} }

4
workflow/engine/xmlform/tasks/tasks_TimingControl.xml
View File

@@ -4,7 +4,7 @@
<INDEX type="hidden"/> <INDEX type="hidden"/>
<IFORM type="hidden"/> <IFORM type="hidden"/>
<TAS_TRANSFER_FLY type="checkbox" value="TRUE" falsevalue="FALSE" defaultvalue="TRUE" group="1"> <TAS_TRANSFER_FLY type="checkbox" value="TRUE" falsevalue="FALSE" defaultvalue="TRUE" group="1">
<en><![CDATA[Allow user defined timing control]]></en> <en><![CDATA[Allow users to change the task duration in runtime]]></en>
</TAS_TRANSFER_FLY> </TAS_TRANSFER_FLY>
<TAS_DURATION type="text" size="3" maxlength="3" defaultvalue="1" required="1" validate="Any" mask="###" group="1" dependentfields="" linkfield="" strto="UPPER" readonly="0" noshowingrid="0" readonlyingrid="0" totalizeable="0" sqlconnection=""> <TAS_DURATION type="text" size="3" maxlength="3" defaultvalue="1" required="1" validate="Any" mask="###" group="1" dependentfields="" linkfield="" strto="UPPER" readonly="0" noshowingrid="0" readonlyingrid="0" totalizeable="0" sqlconnection="">
<en><![CDATA[Task duration]]></en> <en><![CDATA[Task duration]]></en>
@@ -23,7 +23,7 @@ SELECT CALENDAR_UID, CALENDAR_NAME FROM availableCalendars
var toggleFields = function() var toggleFields = function()
{ {
if(getField('TAS_TRANSFER_FLY').checked == true) if(getField('TAS_TRANSFER_FLY').checked == false)
{ {
showRowById('TAS_DURATION'); showRowById('TAS_DURATION');
showRowById('TAS_TIMEUNIT'); showRowById('TAS_TIMEUNIT');