[Fmsystem-commits] [17198] prepare for controller

[sigurdne]

Revision: 17198
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17198
Author:   sigurdne
Date:     2017-10-27 09:36:03 -0400 (Fri, 27 Oct 2017)
Log Message:
-----------
prepare for controller

Modified Paths:
--------------
    trunk/property/inc/class.boadmin_entity.inc.php
    trunk/property/inc/class.soadmin_entity.inc.php
    trunk/property/js/portico/admin_entity.edit_category.js

Modified: trunk/property/inc/class.boadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.boadmin_entity.inc.php     2017-10-24 17:21:55 UTC 
(rev 17197)
+++ trunk/property/inc/class.boadmin_entity.inc.php     2017-10-27 13:36:03 UTC 
(rev 17198)
@@ -600,9 +600,9 @@
                        return $this->so->read_category_tree2($entity_id);
                }
 
-               function get_children2( $entity_id, $parent, $level, $reset = 
false, $table )
+               function get_children2( $entity_id, $parent, $level, $reset = 
false )
                {
-                       return $this->so->get_children2($entity_id, $parent, 
$level, $reset, $table);
+                       return $this->so->get_children2($entity_id, $parent, 
$level, $reset);
                }
 
                function convert_to_eav()

Modified: trunk/property/inc/class.soadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.soadmin_entity.inc.php     2017-10-24 17:21:55 UTC 
(rev 17197)
+++ trunk/property/inc/class.soadmin_entity.inc.php     2017-10-27 13:36:03 UTC 
(rev 17198)
@@ -162,7 +162,7 @@
                        if ($query)
                        {
                                $query = $this->db->db_addslashes($query);
-                               $querymethod = " AND name {$this->like} 
'%{$query}%' OR descr {$this->like} '%{$query}%'";
+                               $querymethod = " AND (name {$this->like} 
'%{$query}%' OR descr {$this->like} '%{$query}%')";
                        }
                        if ($enable_controller)
                        {

Modified: trunk/property/js/portico/admin_entity.edit_category.js
===================================================================
--- trunk/property/js/portico/admin_entity.edit_category.js     2017-10-24 
17:21:55 UTC (rev 17197)
+++ trunk/property/js/portico/admin_entity.edit_category.js     2017-10-27 
13:36:03 UTC (rev 17198)
@@ -35,7 +35,12 @@
                values_tophp.push($(this).val());
        });
 
-       document.form.template_attrib.value = values_tophp;
+       if($("#template_attrib") && values_tophp)
+       {
+
+               $("#template_attrib").val(values_tophp);
+       //      document.form.template_attrib.value = values_tophp;
+       }
        document.form.submit();
 }