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

Merge remote branch 'pm/master'

Browse Source
This commit is contained in:
Ronald Quenta
2015-06-12 14:11:57 -04:00
parent 149b2e59eb 54c4a24916
commit 1734c92375
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.pmDynaform.php
View File

@@ -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] : "")

14
workflow/engine/templates/designer/index.html
View File

@@ -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>