[Fmsystem-commits] [15068] Syncromind: Merge 14936:15027 from trunk

[sigurdne]

Revision: 15068
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15068
Author:   sigurdne
Date:     2016-05-13 12:06:07 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk

Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.soadmin_location.inc.php

Modified: branches/dev-syncromind-2/property/inc/class.soadmin_location.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.soadmin_location.inc.php       
2016-05-13 12:06:05 UTC (rev 15067)
+++ branches/dev-syncromind-2/property/inc/class.soadmin_location.inc.php       
2016-05-13 12:06:07 UTC (rev 15068)
@@ -143,17 +143,18 @@
                                $querymethod = " where name $this->like 
'%$query%' or column_name $this->like '%$query%'";
                        }
 
-                       $sql = "SELECT fm_location_config.* 
,fm_location_type.name as name FROM fm_location_config  $this->join 
fm_location_type on fm_location_config.location_type=fm_location_type.id 
$querymethod";
+                       $sql = "SELECT fm_location_config.* 
,fm_location_type.name as name FROM fm_location_config"
+                               . "  $this->join fm_location_type on 
fm_location_config.location_type=fm_location_type.id $querymethod";
 
                        $this->db->query($sql, __LINE__, __FILE__);
                        $this->total_records = $this->db->num_rows();
 
                        $this->db->limit_query($sql . $ordermethod, $start, 
__LINE__, __FILE__);
 
+                       $config = array();
                        while ($this->db->next_record())
                        {
-                               $config[] = array
-                                       (
+                               $config[] = array(
                                        'column_name' => 
$this->db->f('column_name'),
                                        'input_text' => 
$this->db->f('input_text'),
                                        'f_key' => $this->db->f('f_key'),
@@ -213,9 +214,21 @@
                        $receipt['id'] = $standard['id'];
 
                        $this->init_process();
+                       $default_attrib = array();
 
                        $j = 1;
                        $default_attrib['id'][] = $j;
+                       $default_attrib['column_name'][] = 'id';
+                       $default_attrib['type'][] = 'I';
+                       $default_attrib['precision'][] = 4;
+                       $default_attrib['nullable'][] = 'false';
+                       $default_attrib['input_text'][] = 'id';
+                       $default_attrib['statustext'][] = 'id';
+                       $default_attrib['attrib_sort'][] = '';
+                       $default_attrib['custom'][] = '';
+
+                       $j++;
+                       $default_attrib['id'][] = $j;
                        $default_attrib['column_name'][] = 'location_code';
                        $default_attrib['type'][] = 'V';
                        $default_attrib['precision'][] = 4 * $standard['id'];
@@ -338,6 +351,7 @@
 
 
                        $fd = array();
+                       $fd['id'] = array('type' => 'int', 'precision' => 4, 
'nullable' => true);
                        $fd['location_code'] = array('type' => 'varchar', 
'precision' => 25, 'nullable' => false);
 
                        for ($i = 1; $i < $standard['id'] + 1; $i++)
@@ -625,9 +639,9 @@
                                        if ($column_name == 'street_id')
                                        {
                                                
$this->oProc->AddColumn('fm_location' . $values[$column_name], 'street_number', 
array(
-                                                       'type' => 'varchar', 
'precision' => 10));
+                                                       'type' => 'varchar', 
'precision' => 10, 'nullable' => true));
                                                
$this->oProc->AddColumn('fm_location' . $values[$column_name] . '_history', 
'street_number', array(
-                                                       'type' => 'varchar', 
'precision' => 10));
+                                                       'type' => 'varchar', 
'precision' => 10, 'nullable' => true));
                                                
$this->oProc->DropColumn('fm_location' . $location_type, 
$table_def['fm_location' . $location_type], 'street_number');
                                                
$this->oProc->DropColumn('fm_location' . $location_type . '_history', 
$history_table_def['fm_location' . $location_type] . '_history', 
'street_number');
                                        }