[Fmsystem-commits] [14289] property: minor tweak

[Sigurd Nes]

Revision: 14289
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14289
Author:   sigurdne
Date:     2015-11-06 13:13:27 +0000 (Fri, 06 Nov 2015)
Log Message:
-----------
property: minor tweak

Modified Paths:
--------------
    trunk/property/inc/class.uitts.inc.php
    trunk/property/inc/import/import_update_generic.php

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2015-11-06 13:12:48 UTC (rev 
14288)
+++ trunk/property/inc/class.uitts.inc.php      2015-11-06 13:13:27 UTC (rev 
14289)
@@ -755,7 +755,7 @@
                                                                
$values_combo_box[$i][]  = array
                                                                (
                                                                        'id'    
=> '',
-                                                                       'name'  
=> lang('select') . " '{$attrib['input_text']}'"
+                                                                       'name'  
=> lang('select') . " {$attrib['input_text']}"
                                                                );
 
                                                                
foreach($attrib['choice'] as $choice)
@@ -2262,6 +2262,7 @@
                                }
                        }
 
+
                        $location_data=$bolocation->initiate_ui_location(array(
                                'values'        => 
(isset($values['location_data'])?$values['location_data']:''),
                                'type_id'       => -1, // calculated from 
location_types

Modified: trunk/property/inc/import/import_update_generic.php
===================================================================
--- trunk/property/inc/import/import_update_generic.php 2015-11-06 13:12:48 UTC 
(rev 14288)
+++ trunk/property/inc/import/import_update_generic.php 2015-11-06 13:13:27 UTC 
(rev 14289)
@@ -316,7 +316,7 @@
                                {
                                        if(!$_value = $data[array_search($key, 
$fields)])
                                        {
-                                               throw new Exception("Fant ikke 
verdi for feltet 'primary key'");
+                                               throw new Exception("Fant ikke 
verdi for feltet 'primary key' {$key}");
                                        }
 
                                        $primary_key[] = "$key='{$_value}'";