From 86060d09c473e2c5b07e073870a26e0b78720d8b Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Wed, 10 Jun 2015 17:09:57 -0400
Subject: [PATCH 1/2] PM-2880 "Separar Templates y Process Files..." SOLVED >
 Code Isuue:   Separar Templates y Process Files del Process Object Menu >
 Solution:   se separa la opcion del menu File Manager que contiene dos
 opciones: Templates y Public llevandolo al menu principal   estas dos
 opciones por separado.

---
 workflow/engine/templates/designer/index.html | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html
index 01a77a8be..900944fe0 100644
--- a/workflow/engine/templates/designer/index.html
+++ b/workflow/engine/templates/designer/index.html
@@ -151,12 +151,16 @@
                     <a href="#" class="btn_create mafe-menu-databaseconnections-create"><span></span></a>
                 </li>
                 <li>
-                    <a href="#" class="mafe-menu-permissions"></a>
-                    <a href="#" class="btn_create mafe-menu-permissions-create"><span></span></a>
+                    <a href="#" class="mafe-menu-templates"></a>
+                    <a href="#" class="btn_create mafe-menu-templates-create"><span></span></a>
                 </li>
                 <li>
-                    <a href="#" class="mafe-menu-filemanager"></a>
-                    <a href="#" class="btn_create mafe-menu-filemanager-create"><span></span></a>
+                    <a href="#" class="mafe-menu-public"></a>
+                    <a href="#" class="btn_create mafe-menu-public-create"><span></span></a>
+                </li>
+                <li>
+                    <a href="#" class="mafe-menu-permissions"></a>
+                    <a href="#" class="btn_create mafe-menu-permissions-create"><span></span></a>
                 </li>
             </ul>
         </div>
@@ -164,5 +168,5 @@
             <div class="head"></div>
         </div>
     </section>
-    
+
 </body>
\ No newline at end of file

From 28aa6afa42c408d626d4c157e135ee68fc882ca0 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Fri, 12 Jun 2015 11:32:29 -0400
Subject: [PATCH 2/2] IMPROVEMENT

---
 workflow/engine/classes/class.pmDynaform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php
index d53c5b749..70514d581 100644
--- a/workflow/engine/classes/class.pmDynaform.php
+++ b/workflow/engine/classes/class.pmDynaform.php
@@ -219,7 +219,7 @@ class pmDynaform
                             $cells = array();
                             foreach ($json->columns as $column) {
                                 //data
-                                if ($column->type === "text" || $column->type === "textarea" || $column->type === "dropdown" || $column->type === "suggest" || $column->type === "datetime" || $column->type === "checkbox" || $column->type === "file" || $column->type === "link" || $value === "hidden") {
+                                if ($column->type === "text" || $column->type === "textarea" || $column->type === "dropdown" || $column->type === "suggest" || $column->type === "datetime" || $column->type === "checkbox" || $column->type === "file" || $column->type === "link" || $column->type === "hidden") {
                                     array_push($cells, array(
                                         "value" => isset($row[$column->name]) ? $row[$column->name] : "",
                                         "label" => isset($row[$column->name . "_label"]) ? $row[$column->name . "_label"] : (isset($row[$column->name]) ? $row[$column->name] : "")