[Fmsystem-commits] [15213] tweaks

[sigurdne]

Revision: 15213
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15213
Author:   sigurdne
Date:     2016-05-29 17:17:01 +0000 (Sun, 29 May 2016)
Log Message:
-----------
tweaks

Modified Paths:
--------------
    trunk/property/inc/class.uiadmin_entity.inc.php
    trunk/property/inc/class.uigeneric.inc.php
    trunk/property/js/portico/admin_entity.edit_category.js

Modified: trunk/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.uiadmin_entity.inc.php     2016-05-27 17:47:07 UTC 
(rev 15212)
+++ trunk/property/inc/class.uiadmin_entity.inc.php     2016-05-29 17:17:01 UTC 
(rev 15213)
@@ -987,6 +987,7 @@
                                'form_action' => 
$GLOBALS['phpgw']->link('/index.php', $link_data),
                                'done_action' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiadmin_entity.category',
                                        'entity_id' => $entity_id, 'type' => 
$this->type)),
+                               'base_java_url' => 
json_encode(array('menuaction' => "property.uiadmin_entity.edit_category")),
                                'lang_save' => lang('save'),
                                'lang_done' => lang('done'),
                                'value_id' => $id,

Modified: trunk/property/inc/class.uigeneric.inc.php
===================================================================
--- trunk/property/inc/class.uigeneric.inc.php  2016-05-27 17:47:07 UTC (rev 
15212)
+++ trunk/property/inc/class.uigeneric.inc.php  2016-05-29 17:17:01 UTC (rev 
15213)
@@ -470,6 +470,7 @@
                 */
                public function query()
                {
+                       $query = phpgw::get_var('query');
                        $search = phpgw::get_var('search');
                        $order = phpgw::get_var('order');
                        $draw = phpgw::get_var('draw', 'int');
@@ -479,7 +480,7 @@
                        $params = array(
                                'start' => phpgw::get_var('start', 'int', 
'REQUEST', 0),
                                'results' => phpgw::get_var('length', 'int', 
'REQUEST', 0),
-                               'query' => $search['value'],
+                               'query' => $query ? $query : $search['value'],
                                'order' => 
$columns[$order[0]['column']]['data'],
                                'sort' => $order[0]['dir'],
                                'dir' => $order[0]['dir'],

Modified: trunk/property/js/portico/admin_entity.edit_category.js
===================================================================
--- trunk/property/js/portico/admin_entity.edit_category.js     2016-05-27 
17:47:07 UTC (rev 15212)
+++ trunk/property/js/portico/admin_entity.edit_category.js     2016-05-29 
17:17:01 UTC (rev 15213)
@@ -4,8 +4,15 @@
 
 $(document).ready(function ()
 {
-       var api = oTable0.api();
-       api.on('draw', add_checkall);
+       try
+       {
+               var api = oTable0.api();
+               api.on('draw', add_checkall);
+       }
+       catch(err)
+       {
+
+       }
 });
 
 function add_checkall()