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

Merge branch 'master' of git://github.com/colosa/processmaker into BUG-12115

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2013-11-04 11:19:59 -04:00
parent f692dab57e 02bf036ff0
commit bb63f110e1
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/system/class.publisher.php
View File

@@ -191,7 +191,7 @@ class Publisher
if (($this->publishType == 'dynaform') && (($Part['Template'] == 'xmlform') || ($Part['Template'] == 'xmlform_preview'))) { if (($this->publishType == 'dynaform') && (($Part['Template'] == 'xmlform') || ($Part['Template'] == 'xmlform_preview'))) {
$dynaformShow = (isset( $G_FORM->printdynaform ) && ($G_FORM->printdynaform)) ? 'gulliver/dynaforms_OptionsPrint' : 'gulliver/dynaforms_Options'; $dynaformShow = (isset( $G_FORM->printdynaform ) && ($G_FORM->printdynaform)) ? 'gulliver/dynaforms_OptionsPrint' : 'gulliver/dynaforms_Options';
$G_FORM->fields = G::array_merges( array ('__DYNAFORM_OPTIONS' => new XmlForm_Field_XmlMenu( new Xml_Node( '__DYNAFORM_OPTIONS', 'complete', '', array ('type' => 'xmlmenu','xmlfile' => $dynaformShow $G_FORM->fields = G::array_merges( array ('__DYNAFORM_OPTIONS' => new XmlForm_Field_XmlMenu( new Xml_Node( '__DYNAFORM_OPTIONS', 'complete', '', array ('type' => 'xmlmenu','xmlfile' => $dynaformShow, 'parentFormId' => $G_FORM->id
) ), SYS_LANG, PATH_XMLFORM, $G_FORM ) ) ), SYS_LANG, PATH_XMLFORM, $G_FORM )
), $G_FORM->fields ); ), $G_FORM->fields );
} }

3
gulliver/system/class.xmlMenu.php
View File

@@ -33,6 +33,7 @@
class xmlMenu extends form class xmlMenu extends form
{ {
public $type = 'xmlmenu'; public $type = 'xmlmenu';
public $parentFormId;
} }
/** /**
@@ -50,6 +51,7 @@ class XmlForm_Field_XmlMenu extends XmlForm_Field
public $xmlMenu; public $xmlMenu;
public $home = ''; public $home = '';
public $withoutLabel = true; public $withoutLabel = true;
public $parentFormId;
/** /**
* XmlForm_Field_XmlMenu * XmlForm_Field_XmlMenu
@@ -78,6 +80,7 @@ class XmlForm_Field_XmlMenu extends XmlForm_Field
{ {
$this->xmlMenu = new xmlMenu( $this->xmlfile, $this->home ); $this->xmlMenu = new xmlMenu( $this->xmlfile, $this->home );
$this->xmlMenu->setValues( $value ); $this->xmlMenu->setValues( $value );
$this->xmlMenu->parentFormId = $this->parentFormId;
$this->type = 'xmlmenuDyn'; $this->type = 'xmlmenuDyn';
$template = PATH_CORE . 'templates/' . $this->type . '.html'; $template = PATH_CORE . 'templates/' . $this->type . '.html';
$out = $this->xmlMenu->render( $template, $scriptCode ); $out = $this->xmlMenu->render( $template, $scriptCode );

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

@@ -412,6 +412,9 @@ class AdditionalTables extends BaseAdditionalTables
} }
$stringOr .= ');'; $stringOr .= ');';
eval($stringOr); eval($stringOr);
$oCriteriaCount = clone $oCriteria;
eval('$count = ' . $sClassPeerName . '::doCount($oCriteria);');
} }
if (isset($_POST['sort'])) { if (isset($_POST['sort'])) {

7
workflow/engine/templates/pmTables/data.js
View File

@@ -102,7 +102,7 @@ Ext.onReady(function(){
clearTextButton = new Ext.Action({ clearTextButton = new Ext.Action({
text: 'X', text: 'X',
ctCls:'pm_search_x_button', ctCls:'pm_search_x_button',
handler: GridByDefault handler: GridByDefault
}); });
//This loop loads columns and fields to store and column model //This loop loads columns and fields to store and column model
@@ -463,14 +463,15 @@ onMessageContextMenu = function (grid, rowIndex, e) {
/////JS FUNCTIONS /////JS FUNCTIONS
//Do Search Function //Do Search Function
DoSearch = function(){ DoSearch = function(){
infoGrid.store.load({params: {textFilter: searchText.getValue()}}); infoGrid.store.setBaseParam('textFilter', searchText.getValue());
infoGrid.store.load({params: {start : 0 , limit : pageSize }});
}; };
//Load Grid By Default //Load Grid By Default
GridByDefault = function(){ GridByDefault = function(){
searchText.reset(); searchText.reset();
infoGrid.store.setBaseParam('textFilter', searchText.getValue());
infoGrid.store.load(); infoGrid.store.load();
}; };