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

Merge remote branch 'upstream/master' into BUG-11075

Browse Source
This commit is contained in:
Hector Cortez
2013-04-05 09:24:06 -04:00
parent ee74f95b4c 2c3aa66759
commit bb33e69c8a
12 changed files with 67 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/classes/class.applications.php
View File

@@ -232,7 +232,12 @@ class Applications
if ($dateFrom != '') {
if ($dateTo != '') {
$Criteria->add( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
if ($dateFrom == $dateTo) {
$dateAux = $dateFrom;
$dateFrom = $dateAux . " 00:00:00";
$dateTo = $dateAux . " 23:23:59";
}
$Criteria->add( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
$CriteriaCount->add( $CriteriaCount->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
} else {
$Criteria->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );

11
workflow/engine/classes/model/AdditionalTables.php
View File

@@ -649,9 +649,9 @@ class AdditionalTables extends BaseAdditionalTables
foreach ($caseData as $dKey => $dValue) {
if (!is_array($dValue)) {
foreach ($fieldTypes as $key => $fieldType) {
foreach ($fieldType as $name => $type) {
foreach ($fieldType as $name => $theType) {
if (strtoupper($dKey) == $name) {
$caseData[$dKey] = validateType ($dValue, $type);
$caseData[$dKey] = validateType ($dValue, $theType);
unset($name);
}
}
@@ -787,7 +787,9 @@ class AdditionalTables extends BaseAdditionalTables
$obj->fromArray(array_change_key_case($caseData, CASE_UPPER), BasePeer::TYPE_FIELDNAME);
$obj->setAppUid($appUid);
$obj->setAppNumber($appNumber);
$obj->setAppStatus($appStatus);
if (method_exists($obj, 'setAppStatus')) {
$obj->setAppStatus($appStatus);
}
$obj->save();
}
break;
@@ -807,6 +809,9 @@ class AdditionalTables extends BaseAdditionalTables
$obj->fromArray(array_change_key_case($gridRow, CASE_UPPER), BasePeer::TYPE_FIELDNAME);
$obj->setAppUid($appUid);
$obj->setAppNumber($appNumber);
if (method_exists($obj, 'setAppStatus')) {
$obj->setAppStatus($appStatus);
}
$obj->setRow($i);
$obj->save();
}

7
workflow/engine/methods/groups/groups_Ajax.php
View File

@@ -178,6 +178,13 @@ switch ($_POST['action']) {
$criteria = new Criteria( 'workflow' );
$criteria->add(ObjectPermissionPeer::USR_UID, $_POST['GRP_UID']);
ObjectPermissionPeer::doDelete( $criteria );
//Delete supervisors assignments
require_once 'classes/model/ProcessUser.php';
$criteria = new Criteria( 'workflow' );
$criteria->add(ProcessUserPeer::USR_UID, $_POST['GRP_UID']);
$criteria->add(ProcessUserPeer::PU_TYPE, 'GROUP_SUPERVISOR');
ProcessUserPeer::doDelete( $criteria );
echo '{success: true}';
break;

3
workflow/engine/templates/setup/main.js
View File

@@ -117,8 +117,9 @@ var main = function(){
minSize: 175,
maxSize: 400,
collapsible: true,
collapseMode:'mini',
hideCollapseTool: true,
animCollapse: true,
margins: '0 0 0 5',
activeTab: 0,
enableTabScroll: true,

15
workflow/engine/templates/xmlform.html
View File

@@ -114,6 +114,7 @@
sub.sendObj = false;
{/literal}
{/if}
{foreach from=$form->fields item=field key=name}
i = myForm.aElements.length;
@@ -174,8 +175,14 @@
{/if}
{/if}
{/foreach}
{literal}}{/literal}
{/if}
{if $printJavaScript}
leimnud.event.add(window,'load',function(){literal}{{/literal}loadForm_{$form->id}('{$form->ajaxServer}');if (typeof(dynaformOnload) !== 'undefined') {literal}{dynaformOnload();}}{/literal});
{literal}}{/literal}
{if (isset($form->jsDesignerPreview))}
{$form->jsDesignerPreview}
{/if}
{/if}
{if $printJavaScript}
leimnud.event.add(window,'load',function(){literal}{{/literal}loadForm_{$form->id}('{$form->ajaxServer}');if (typeof(dynaformOnload) != 'undefined') {literal}{dynaformOnload();}}{/literal});
{/if}

4
workflow/engine/xmlform/dynaforms/fields/_options.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<dynaForm name="_options" type="grid" width="100%" editRow="0" insertRow="0">
<NAME type="text" validate="Field" size="25">
<NAME type="text" validate="Field" size="19">
<en>Value</en>
</NAME>
<LABEL type="text" size="25">
<LABEL type="text" size="19">
<en>Label</en>
</LABEL>
<OPTGROUP type="checkbox" value="1" falsevalue="0" defaultvalue="0">

2
workflow/engine/xmlform/dynaforms/fields/dropdown.xml
View File

@@ -123,7 +123,7 @@ function gridOptionOptGroupColumn(show, swDelete)
lblOptGroup = tableGrid.rows[i].cells[j].innerHTML;
}
tableGrid.rows[i].cells[j].style.width = "20%";
tableGrid.rows[i].cells[j].style.width = "25%";
tableGrid.rows[i].cells[j].innerHTML = (show == 1)? lblOptGroup : "";
}
}

2
workflow/engine/xmlform/triggers/triggersCustom.html
View File

@@ -17,7 +17,7 @@
<td colspan="2">{$form.TRI_UID}</td>
</tr>
<tr>
<td class='FormLabel' width="{$form_labelWidth}">{$TRI_TITLE}</td>
<td class='FormLabel' width="{$form_labelWidth}"><font color="red">* </font> {$TRI_TITLE}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.TRI_TITLE} </td> //-->
<td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.TRI_TITLE}</td>
</tr>

4
workflow/engine/xmlform/triggers/triggersCustom.xml
View File

@@ -9,7 +9,7 @@
</TITLE>
<TRI_UID type="hidden"/>
<TRI_TITLE type="text" size="80" maxlength="100">
<TRI_TITLE type="text" size="80" maxlength="100" required="1">
<en>Title</en>
</TRI_TITLE>
<TRI_PARAM type="hidden" value=""/>
@@ -104,4 +104,4 @@ function cancel(){
}
]]></JS>
</dynaForm>
</dynaForm>