[Phpgroupware-cvs] CVS: property list_equipment.php,1.4.2.1,1.4.2.2

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property
In directory subversions:/tmp/cvs-serv28982

Modified Files:
      Tag: Version-0_9_14-branch
        list_equipment.php 
Log Message:
no message

Index: list_equipment.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_equipment.php,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** list_equipment.php  2 Dec 2002 18:35:03 -0000       1.4.2.1
--- list_equipment.php  3 Dec 2002 18:34:47 -0000       1.4.2.2
***************
*** 204,208 ****
  
  
!               $sql = "SELECT fm_equipment.equipment_id, 
fm_equipment_type.name, fm_equipment.equipment_type_id, fm_equipment.descr, "
                        . " fm_equipment.objekt_id, fm_equipment.bygg_id, 
fm_equipment.seksjons_id, fm_equipment.street, fm_equipment_type_attrib.id, "
                        . " fm_equipment_type.type_descr,boei_bydel.omraade_id, 
street"
--- 204,208 ----
  
  
!               $sql = "SELECT c,i,n,fm_equipment.equipment_id, 
fm_equipment_type.name, fm_equipment.equipment_type_id, fm_equipment.descr, "
                        . " fm_equipment.objekt_id, fm_equipment.bygg_id, 
fm_equipment.seksjons_id, fm_equipment.street, fm_equipment_type_attrib.id, "
                        . " fm_equipment_type.type_descr,boei_bydel.omraade_id, 
street"
***************
*** 251,254 ****
--- 251,255 ----
        $t->set_var('lang_edit',lang('Edit'));
        $t->set_var('lang_attribute',lang('Attribute'));
+       $t->set_var('lang_attribute2',lang('Attribute'));
        $t->set_var('lang_delete',lang('Delete'));
        $t->set_var('lang_event',lang('Event'));
***************
*** 287,295 ****
  
  
- 
                $equipment_type_edit = 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('equipment_type_id'));
                if (! $equipment_type_edit)  $equipment_type_edit  = ' ';
  
  
  
                $t->set_var('tr_color',$tr_color);
--- 288,305 ----
  
  
                $equipment_type_edit = 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('equipment_type_id'));
                if (! $equipment_type_edit)  $equipment_type_edit  = ' ';
  
+               if ($attribute)
+               {
+                               $char_value = 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('c'));
+                               if (! $char_value)  $char_value  = ' ';
+                               $int_value = 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('i'));
+                               if (! $int_value)  $int_value  = ' ';
+                               $num_value = 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('n'));
+                               if (! $num_value)  $num_value  = ' ';
+                               
$t->set_var('lang_attribute2',$char_value.$int_value.$num_value);
  
+               }
  
                $t->set_var('tr_color',$tr_color);