[Fmsystem-commits] [8779]

[Erik Holm-Larsen]

Revision: 8779
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8779
Author:   erikhl
Date:     2012-02-03 09:34:51 +0000 (Fri, 03 Feb 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uiprocedure.inc.php
    trunk/controller/setup/phpgw_no.lang

Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php      2012-02-03 08:26:49 UTC 
(rev 8778)
+++ trunk/controller/inc/class.uiprocedure.inc.php      2012-02-03 09:34:51 UTC 
(rev 8779)
@@ -309,11 +309,23 @@
                                $control_areas_array2 = array();
                                foreach($control_areas['cat_list'] as $cat_list)
                                {
-                                       $control_areas_array2[] = array
-                                       (
-                                               'id'    => $cat_list['cat_id'],
-                                               'name'  => $cat_list['name'],
-                                       );              
+                                       if($cat_list['cat_id'] == 
$procedure->get_control_area_id())
+                                       {
+                                               $control_areas_array2[] = array
+                                               (
+                                                       'id'    => 
$cat_list['cat_id'],
+                                                       'name'  => 
$cat_list['name'],
+                                                       'selected' => 1,
+                                               );
+                                       }
+                                       else
+                                       {
+                                               $control_areas_array2[] = array
+                                               (
+                                                       'id'    => 
$cat_list['cat_id'],
+                                                       'name'  => 
$cat_list['name'],
+                                               );
+                                       }
                                }
                                // END as categories
 /*                             $control_area_array = 
$this->so_control_area->get_control_area_array();

Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang        2012-02-03 08:26:49 UTC (rev 
8778)
+++ trunk/controller/setup/phpgw_no.lang        2012-02-03 09:34:51 UTC (rev 
8779)
@@ -291,9 +291,9 @@
 start_date     controller      no      Start dato
 planned_date   controller      no      Planlagt dato
 end_date       controller      no      Slutt dato
-View_locations_for_control     controller      no      Vis 
bygg/kontroll-knytning      
-Add_locations_for_control      controller      no      Legg til knytning for 
bygg
-View_component_for_control     controller      no      Vis bygg/utstyr-knytning
+View_locations_for_control     controller      no      Vis knytning mot 
lokasjon
+Add_locations_for_control      controller      no      Legg til knytning mot 
lokasjon
+View_component_for_control     controller      no      Vis knytning mot utstyr
 Add_component_for_control      controller      no      Legg til knytning mot 
utstyr
 component_for_control  controller      no      Utstyr tilknyttet kontroll
 Choose_component_type  controller      no      Velg utstyrstype