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

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Fernando Ontiveros
2012-11-09 09:16:04 -04:00
parent ec6413a2ce c169fd1c2b
commit ae211bea3a
6 changed files with 184 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gulliver/system/class.xmlform.php
View File

@@ -4030,7 +4030,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
if ($this->renderMode != 'edit' && $value == 'today') {
$mask = str_replace( "%", "", $this->mask );
$value = date( $mask );
$value = date( masktophp($mask) );
return $value;
}
return $this->__draw_widget( $id, $value, $owner );
@@ -4065,7 +4065,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
}
if ($v == 'today') {
$mask = str_replace( "%", "", $this->mask );
$v = date( $mask );
$v = date( masktophp($mask) );
}
$html = '<input ' . $this->NSRequiredValue() . ' class="module_app_input___gray" id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" type ="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value="' . $this->htmlentities( $v, ENT_COMPAT, 'utf-8' ) . '" required="' . $isRequired . '" style="display:none;' . htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '"/>' . htmlentities( $v, ENT_COMPAT, 'utf-8' );
} else {

5
workflow/engine/classes/class.processMap.php
View File

@@ -792,7 +792,7 @@ class processMap
$externalSteps = $oPluginRegistry->getSteps();
$aSteps = array ();
$aSteps[] = array ('STEP_TITLE' => 'char','STEP_UID' => 'char','STEP_TYPE_OBJ' => 'char','STEP_CONDITION' => 'char','STEP_POSITION' => 'integer'
$aSteps[] = array ('STEP_TITLE' => 'char','STEP_UID' => 'char','STEP_TYPE_OBJ' => 'char','STEP_MODE' => 'char','STEP_CONDITION' => 'char','STEP_POSITION' => 'integer'
);
$oCriteria = new Criteria( 'workflow' );
$oCriteria->add( StepPeer::TAS_UID, $sTaskUID );
@@ -850,7 +850,8 @@ class processMap
}
break;
}
$aSteps[] = array ('STEP_TITLE' => $sTitle,'STEP_UID' => $aRow['STEP_UID'],'STEP_TYPE_OBJ' => $aRow['STEP_TYPE_OBJ'],'STEP_CONDITION' => $aRow['STEP_CONDITION'],'STEP_POSITION' => $aRow['STEP_POSITION'],'urlEdit' => $urlEdit,'linkEditValue' => $linkEditValue,'PRO_UID' => $aRow['PRO_UID']
$aSteps[] = array ('STEP_TITLE' => $sTitle,'STEP_UID' => $aRow['STEP_UID'],'STEP_TYPE_OBJ' => $aRow['STEP_TYPE_OBJ'],'STEP_MODE' => $aRow['STEP_MODE'],'STEP_CONDITION' => $aRow['STEP_CONDITION'],'STEP_POSITION' => $aRow['STEP_POSITION'],'urlEdit' => $urlEdit,'linkEditValue' => $linkEditValue,'PRO_UID' => $aRow['PRO_UID']
);
$oDataset->next();
}

2
workflow/engine/js/processmap/core/processmap.js
View File

@@ -1399,7 +1399,7 @@ var processmap=function(){
}
panel.options={
limit:true,
size:{w:670,h:450},
size:{w:770,h:450},
position:{x:50,y:50,center:true},
title: G_STRINGS.ID_PROCESSMAP_TASK_STEPS+" "+data.label.substr(0,82) + (data.label.length>=82 ? "..." : "") ,
theme:this.options.theme,

4
workflow/engine/xmlform/steps/steps_List.xml
View File

@@ -17,6 +17,10 @@
<en>Type<option name="DYNAFORM">Dynaform</option><option name="INPUT_DOCUMENT">Input Document</option><option name="OUTPUT_DOCUMENT">Output Document</option><option name="EXTERNAL">External Step</option></en>
</STEP_TYPE_OBJ>
<STEP_MODE type="dropdown" colWidth="80" titleAlign="left" align="left">
<en>Mode<option name=""><![CDATA[N/A]]></option><option name="VIEW">View</option><option name="EDIT">Edit</option></en>
</STEP_MODE>
<linkEditValue type="link" value="@#linkEditValue" link="javascript:@#urlEdit" colWidth="40" align="center"/>
<DELETE type="link" colWidth="30" value="@G::LoadTranslation(ID_DE_ASSIGN)" link="#" onclick="stepDelete(@QSTEP_UID, @QSTEP_POSITION);return false;"><en></en></DELETE>