[Fmsystem-commits] [13132] sorting of custom functions

[Sigurd Nes]

Revision: 13132
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13132
Author:   sigurdne
Date:     2015-05-02 11:06:51 +0000 (Sat, 02 May 2015)
Log Message:
-----------
sorting of custom functions

Modified Paths:
--------------
    branches/dev-syncromind/admin/inc/class.ui_custom.inc.php
    branches/dev-syncromind/phpgwapi/inc/class.custom_functions.inc.php

Modified: branches/dev-syncromind/admin/inc/class.ui_custom.inc.php
===================================================================
--- branches/dev-syncromind/admin/inc/class.ui_custom.inc.php   2015-05-02 
11:05:26 UTC (rev 13131)
+++ branches/dev-syncromind/admin/inc/class.ui_custom.inc.php   2015-05-02 
11:06:51 UTC (rev 13132)
@@ -543,7 +543,7 @@
                                'sort_name'                     => 
$this->nextmatchs->show_sort_order(array
                                                                                
(
                                                                                
        'sort'  => $this->sort,
-                                                                               
        'var'   => 'column_name',
+                                                                               
        'var'   => 'file_name',
                                                                                
        'order' => $this->order,
                                                                                
        'extra' => array('menuaction'   => 
'admin.ui_custom.list_custom_function',
                                                                                
                                'appname'       => $appname,
@@ -555,7 +555,7 @@
                                'sort_sorting'          => 
$this->nextmatchs->show_sort_order(array
                                                                                
(
                                                                                
        'sort'  => $this->sort,
-                                                                               
        'var'   => 'custom_function_sort',
+                                                                               
        'var'   => 'custom_sort',
                                                                                
        'order' => $this->order,
                                                                                
        'extra' => array('menuaction'   => 
'admin.ui_custom.list_custom_function',
                                                                                
                                'appname'       => $appname,

Modified: branches/dev-syncromind/phpgwapi/inc/class.custom_functions.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.custom_functions.inc.php 
2015-05-02 11:05:26 UTC (rev 13131)
+++ branches/dev-syncromind/phpgwapi/inc/class.custom_functions.inc.php 
2015-05-02 11:06:51 UTC (rev 13132)
@@ -270,11 +270,7 @@
                        $ordermethod = ' ORDER BY custom_sort ASC';
                        if ( isset($data['order']) && $data['order'] )
                        {
-                               $data['sort'] = 'ASC';
-                               if ( isset($data['sort']) && $data['sort'] == 
'DESC' )
-                               {
-                                       $data['sort'] = 'DESC';
-                               }
+                               $data['sort'] = isset($data['sort']) && 
$data['sort'] ? $data['sort'] : 'ASC';
 
                                $data['order'] = 
$this->_db->db_addslashes($data['order']);
                                $ordermethod = " ORDER BY {$data['order']} 
{$data['sort']}";