[Fmsystem-commits] [16953] controller: fix register to location

[sigurdne]

Revision: 16953
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16953
Author:   sigurdne
Date:     2017-08-07 10:21:28 -0400 (Mon, 07 Aug 2017)
Log Message:
-----------
controller: fix register to location

Modified Paths:
--------------
    trunk/controller/inc/class.uicontrol_register_to_location.inc.php
    trunk/property/inc/class.bolocation.inc.php

Modified: trunk/controller/inc/class.uicontrol_register_to_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_register_to_location.inc.php   
2017-08-07 11:14:39 UTC (rev 16952)
+++ trunk/controller/inc/class.uicontrol_register_to_location.inc.php   
2017-08-07 14:21:28 UTC (rev 16953)
@@ -239,7 +239,7 @@
                                'orderable' => false,
                                'formatter' => false,
                                'visible' => true,
-                               'class' => ''
+                               'className' => 'center'
                        );
 
                        $columndef[] = array
@@ -249,7 +249,7 @@
                                'orderable' => false,
                                'formatter' => false,
                                'visible' => true,
-                               'class' => ''
+                               'className' => 'center'
                        );
 
                        $count_fields = count($uicols['name']);
@@ -256,15 +256,6 @@
 
                        for ($i = 0; $i < $count_fields; $i++)
                        {
-                               switch ($uicols['datatype'][$i])
-                               {
-                                       case 'link':
-                                               $formatter = 'link';
-                                               break;
-                                       default:
-                                               $formatter = 
$uicols['formatter'][$i];
-                               }
-
                                if ($uicols['name'][$i])
                                {
                                        if ($uicols['input_type'][$i] == 
'hidden')
@@ -271,15 +262,27 @@
                                        {
                                                continue;
                                        }
-                                       $columndef[] = array
-                                               (
+
+                                       $params = array(
                                                'data' => $uicols['name'][$i],
                                                'title' => $uicols['descr'][$i],
                                                'orderable' => 
!!$uicols['sortable'][$i],
-                                               'formatter' => $formatter,
                                                'visible' => 
$uicols['input_type'][$i] == 'hidden' ? false : true,
-                                               'class' => 
$uicols['classname'][$i],
+                                               'className' => 'left',
                                        );
+
+                                       switch ($uicols['datatype'][$i])
+                                       {
+                                               case 'link':
+                               //                      $params['formatter'] = 
'JqueryPortico.formatLinkGeneric';
+                                                       break;
+                                               case 'loc1':
+                               //                      $params['formatter'] = 
'JqueryPortico.searchLink';
+                                                       break;
+                                               default:
+                                       }
+
+                                       $columndef[] = $params;
                                }
                        }
 

Modified: trunk/property/inc/class.bolocation.inc.php
===================================================================
--- trunk/property/inc/class.bolocation.inc.php 2017-08-07 11:14:39 UTC (rev 
16952)
+++ trunk/property/inc/class.bolocation.inc.php 2017-08-07 14:21:28 UTC (rev 
16953)
@@ -762,6 +762,8 @@
                                'lookup_tenant' => $data['lookup_tenant'],
                                'filter_role_on_contact' => 
$data['filter_role_on_contact'],
                                'role_id' => $data['role_id'],
+                               'control_registered' => 
$data['control_registered'],
+                               'control_id' => $data['control_id'],
                                'filter' => $this->filter,
                                'cat_id' => $this->cat_id,
                                'type_id' => ($data['type_id']) ? 
$data['type_id'] : $this->type_id,