From e9a6747aec16d46dfc125074fa2c8d24e479a40f Mon Sep 17 00:00:00 2001
From: nuxsmin <nuxsmin@syspass.org>
Date: Wed, 2 Nov 2016 23:45:26 +0100
Subject: [PATCH] * [DEV] Improved account search handling

---
 .../views/grid/datagrid-rows.inc              | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/inc/themes/material-blue/views/grid/datagrid-rows.inc b/inc/themes/material-blue/views/grid/datagrid-rows.inc
index cc4e9625..36c4a265 100644
--- a/inc/themes/material-blue/views/grid/datagrid-rows.inc
+++ b/inc/themes/material-blue/views/grid/datagrid-rows.inc
@@ -1,7 +1,7 @@
 <?php
 /**
  * @var $data  SP\Html\DataGrid\DataGridTab
- * @var $this SP\Core\Template
+ * @var $this  SP\Core\Template
  */
 ?>
 
@@ -10,37 +10,45 @@
     <div class="noRes round"><?php echo _('No se encontraron registros'); ?></div>
 <?php else: ?>
     <?php foreach ($data->getData()->getData() as $dataIndex => $dataItem): ?>
-        <?php if($dataIndex === 'count'): continue; endif; ?>
+        <?php if ($dataIndex === 'count'): continue; endif; ?>
         <ul>
             <?php foreach ($data->getData()->getDataRowSources() as $rowSrc): ?>
-                <li class="cell-data" style="width: <?php echo $data->getHeader()->getWidth(); ?>%;"><?php echo ($dataItem->{$rowSrc} !== '') ? $dataItem->{$rowSrc} : '&nbsp;'; // Fix height ?></li>
+                <li class="cell-data"
+                    style="width: <?php echo $data->getHeader()->getWidth(); ?>%;"><?php echo ($dataItem->{$rowSrc} !== '') ? $dataItem->{$rowSrc} : '&nbsp;'; // Fix height ?></li>
             <?php endforeach; ?>
 
             <?php if (count($data->getData()->getDataRowSourcesWithIcon()) > 0): ?>
                 <li class="cell-nodata" style="width: <?php echo $data->getHeader()->getWidth(); ?>%;">
                     <?php foreach ($data->getData()->getDataRowSourcesWithIcon() as $rowSrcIcon): ?>
                         <?php if ($dataItem->{$rowSrcIcon[0]} == 1): ?>
-                            <i class="material-icons <?php echo $rowSrcIcon[1]->getClass(); ?>" title="<?php echo $rowSrcIcon[1]->getTitle(); ?>">
+                            <i class="material-icons <?php echo $rowSrcIcon[1]->getClass(); ?>"
+                               title="<?php echo $rowSrcIcon[1]->getTitle(); ?>">
                                 <?php echo $rowSrcIcon[1]->getIcon(); ?>
                             </i>
+                        <?php else: ?>
+                            &nbsp;
                         <?php endif; ?>
                     <?php endforeach; ?>
                 </li>
             <?php endif; ?>
 
             <li class="cell-actions round">
-                <?php foreach ($data->getDataActions() as $action): ?>
-                    <?php if (!$action->isSkip()): ?>
-                        <?php if ($action->getFilterRowSource() && $dataItem->{$action->getFilterRowSource()} == 1): continue; endif; ?>
-                        <i class="btn-action material-icons <?php echo $action->getIcon()->getClass(); ?>"
-                           title="<?php echo $action->getTitle(); ?>"
-                           data-action-id="<?php echo $action->getId(); ?>"
-                           data-nextaction-id="<?php echo $actionId; ?>"
-                           data-item-id="<?php echo $dataItem->{$data->getData()->getDataRowSourceId()}; ?>"
-                           data-activetab="<?php echo $index; ?>"
-                           data-onclick="<?php echo $action->getOnClick(); ?>"><?php echo $action->getIcon()->getIcon(); ?></i>
-                    <?php endif; ?>
-                <?php endforeach; ?>
+                <?php if (count($data->getDataActions()) > 0): ?>
+                    <?php foreach ($data->getDataActions() as $action): ?>
+                        <?php if (!$action->isSkip()): ?>
+                            <?php if ($action->getFilterRowSource() && $dataItem->{$action->getFilterRowSource()} == 1): continue; endif; ?>
+                            <i class="btn-action material-icons <?php echo $action->getIcon()->getClass(); ?>"
+                               title="<?php echo $action->getTitle(); ?>"
+                               data-action-id="<?php echo $action->getId(); ?>"
+                               data-nextaction-id="<?php echo $actionId; ?>"
+                               data-item-id="<?php echo $dataItem->{$data->getData()->getDataRowSourceId()}; ?>"
+                               data-activetab="<?php echo $index; ?>"
+                               data-onclick="<?php echo $action->getOnClick(); ?>"><?php echo $action->getIcon()->getIcon(); ?></i>
+                        <?php endif; ?>
+                    <?php endforeach; ?>
+                <?php else: ?>
+                    &nbsp;
+                <?php endif; ?>
             </li>
         </ul>
     <?php endforeach; ?>