[Fmsystem-commits] [16830]

[nelson . guerra]

Revision: 16830
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16830
Author:   nelson224
Date:     2017-06-05 09:38:09 -0400 (Mon, 05 Jun 2017)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.uireport.inc.php

Modified: branches/dev-syncromind-2/property/inc/class.uireport.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uireport.inc.php       
2017-06-05 13:37:49 UTC (rev 16829)
+++ branches/dev-syncromind-2/property/inc/class.uireport.inc.php       
2017-06-05 13:38:09 UTC (rev 16830)
@@ -350,7 +350,9 @@
                                'restricted_value' => lang('Restricted value'),
                                'operator' => lang('Operator'),
                                'value' => lang('Value'),
-                               'conector' => lang('Conector')
+                               'conector' => lang('Conector'),
+                               'uselect' => lang('Unselect'),
+                               'delete' => lang('Delete')
                        );
                        
                        $data = array
@@ -447,7 +449,8 @@
                        
                        $criteria = $this->_validate_criteria();
                        
-                       $group = array($group_by => $group_by);
+                       $group = ($group_by) ? array($group_by => $group_by) : 
array();
+
                        $order = array($order_by => $order_by);
                        
                        $columns = array();
@@ -467,11 +470,6 @@
                        {
                                $this->receipt['error'][] = array('msg' => 
lang('Please select dataset name !'));
                        }
-                       
-                       if (!count($group))
-                       {
-                               $this->receipt['error'][] = array('msg' => 
lang('Please select a group !'));
-                       }
 
                        if (!count($aggregate))
                        {