From 862d6531db24fc3b3c2dfcafcb00df5e715ec0e1 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Fri, 1 Nov 2013 09:51:03 -0400
Subject: [PATCH 1/3] BUG-12254 Funcionalidad Search en las grillas DATA de los
 PMTables y Report Tables.

Se aniadio la nueva funcionalidad de busqueda en el display de los datos de los PMTables y Report Tables, en ADMIN > Settings > PM Tables > Data, el cual realiza las busquedas por todas las columnas del PM Table o Report Table.

Se corrigio el ordenamiento ASC y DESC.
---
 workflow/engine/templates/pmTables/data.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/templates/pmTables/data.js b/workflow/engine/templates/pmTables/data.js
index 82a0b529b..fa5ec31d3 100755
--- a/workflow/engine/templates/pmTables/data.js
+++ b/workflow/engine/templates/pmTables/data.js
@@ -102,7 +102,7 @@ Ext.onReady(function(){
   clearTextButton = new Ext.Action({
     text: 'X',
     ctCls:'pm_search_x_button',
-    handler: GridByDefault 
+    handler: GridByDefault
   });
 
   //This loop loads columns and fields to store and column model
@@ -463,14 +463,15 @@ onMessageContextMenu = function (grid, rowIndex, e) {
 /////JS FUNCTIONS
 
 //Do Search 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
 GridByDefault = function(){
   searchText.reset();
+  infoGrid.store.setBaseParam('textFilter', searchText.getValue());
   infoGrid.store.load();
 }; 
 

From 3c401e1c56ed9ecb8c736ee4cd15ac241db44775 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Fri, 1 Nov 2013 16:26:56 -0400
Subject: [PATCH 2/3] BUG-12254 Funcionalidad Search en las grillas DATA de los
 PMTables y Report Tables.

Arreglando el contador de la paginacion y total de rows desplegados.
---
 workflow/engine/classes/model/AdditionalTables.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/workflow/engine/classes/model/AdditionalTables.php b/workflow/engine/classes/model/AdditionalTables.php
index 22e511165..104275c1e 100755
--- a/workflow/engine/classes/model/AdditionalTables.php
+++ b/workflow/engine/classes/model/AdditionalTables.php
@@ -412,6 +412,9 @@ class AdditionalTables extends BaseAdditionalTables
             }
             $stringOr .= ');';
             eval($stringOr);
+
+            $oCriteriaCount = clone $oCriteria;
+            eval('$count = ' . $sClassPeerName . '::doCount($oCriteria);');
         }
 
         if (isset($_POST['sort'])) {

From 9562c54b3e181055af54b969b413db655f1435aa Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Mon, 4 Nov 2013 10:46:36 -0400
Subject: [PATCH 3/3] Add attribute "parentFormId" to "XmlForm_Field_XmlMenu"
 class

---
 gulliver/system/class.publisher.php | 2 +-
 gulliver/system/class.xmlMenu.php   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gulliver/system/class.publisher.php b/gulliver/system/class.publisher.php
index def8a217f..1088b1014 100755
--- a/gulliver/system/class.publisher.php
+++ b/gulliver/system/class.publisher.php
@@ -191,7 +191,7 @@ class Publisher
 
                 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';
-                    $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 )
                     ), $G_FORM->fields );
                 }
diff --git a/gulliver/system/class.xmlMenu.php b/gulliver/system/class.xmlMenu.php
index 216c74c9d..bde2c516c 100755
--- a/gulliver/system/class.xmlMenu.php
+++ b/gulliver/system/class.xmlMenu.php
@@ -33,6 +33,7 @@
 class xmlMenu extends form
 {
     public $type = 'xmlmenu';
+    public $parentFormId;
 }
 
 /**
@@ -50,6 +51,7 @@ class XmlForm_Field_XmlMenu extends XmlForm_Field
     public $xmlMenu;
     public $home = '';
     public $withoutLabel = true;
+    public $parentFormId;
 
     /**
      * XmlForm_Field_XmlMenu
@@ -78,6 +80,7 @@ class XmlForm_Field_XmlMenu extends XmlForm_Field
     {
         $this->xmlMenu = new xmlMenu( $this->xmlfile, $this->home );
         $this->xmlMenu->setValues( $value );
+        $this->xmlMenu->parentFormId = $this->parentFormId;
         $this->type = 'xmlmenuDyn';
         $template = PATH_CORE . 'templates/' . $this->type . '.html';
         $out = $this->xmlMenu->render( $template, $scriptCode );