[Fmsystem-commits] [15719] menu items

[sigurdne]

Revision: 15719
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15719
Author:   sigurdne
Date:     2016-09-22 12:30:58 +0000 (Thu, 22 Sep 2016)
Log Message:
-----------
menu items

Modified Paths:
--------------
    branches/dev-syncromind-2/rental/inc/class.menu.inc.php
    branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php

Modified: branches/dev-syncromind-2/rental/inc/class.menu.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/class.menu.inc.php     2016-09-22 
02:45:52 UTC (rev 15718)
+++ branches/dev-syncromind-2/rental/inc/class.menu.inc.php     2016-09-22 
12:30:58 UTC (rev 15719)
@@ -143,6 +143,11 @@
                        if(!$use_fellesdata)
                        {
                                $menus['navigation'] = 
array_reverse($menus['navigation'], true);
+                               $menus['navigation']['schedule'] = array(
+                                       'text' => lang('schedule'),
+                                       'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'rental.uicomposite.schedule')),
+                                       'image' => array('rental', 
'text-x-generic'),
+                               );
                                $menus['navigation']['application'] = array(
                                        'text' => lang('application'),
                                        'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'rental.uiapplication.index')),

Modified: branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php      
2016-09-22 02:45:52 UTC (rev 15718)
+++ branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php      
2016-09-22 12:30:58 UTC (rev 15719)
@@ -146,6 +146,7 @@
                        $sort_field = ($columns[$order[0]['column']]['data']) ? 
$columns[$order[0]['column']]['data'] : 'id';
                        $sort_ascending = ($order[0]['dir'] == 'desc') ? false 
: true;
                        $search_for = (is_array($search)) ? $search['value'] : 
$search;
+                       $search_for = $search_for ? $search_for : '';
                        $search_type = phpgw::get_var('search_option', 
'string', 'REQUEST', 'all');
 
                        $export = phpgw::get_var('export', 'bool');
@@ -1305,4 +1306,4 @@
 
                        return $data;
                }
-       }
\ No newline at end of file
+       }