[Fmsystem-commits] [9878]

[Torstein]

Revision: 9878
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9878
Author:   vator
Date:     2012-08-20 11:28:53 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicontrol_location.inc.php
    
trunk/controller/templates/base/control_location/register_control_to_location.xsl

Modified: trunk/controller/inc/class.uicontrol_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_location.inc.php       2012-08-20 
09:29:01 UTC (rev 9877)
+++ trunk/controller/inc/class.uicontrol_location.inc.php       2012-08-20 
11:28:53 UTC (rev 9878)
@@ -122,7 +122,6 @@
                                $ok = 
$this->so_control->register_control_to_location($control_id, $values);
 
                                $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'controller.uicontrol_location.index', 'control_id' => 
$control_id));
-
                        }
                        else
                        {
@@ -177,16 +176,22 @@
                                                'name'  => $cat_list['name'],
                                        );              
                                }
-                                               
+                               
+                               $control = $this->so_control->get_single( 
$control_id ); 
+                               $current_control_area_id = 
$control->get_control_area_id();
+                               $controls_array = 
$this->so_control->get_controls_by_control_area( $current_control_area_id );    
      
+                               
                                $data = array(
-                                       'view'                                  
                        => "register_control_to_location",
-                                       'control_id'                            
        => $control_id,
-                                       'control_areas_array'   => 
$control_areas_array,
-                                       'filter_form'                           
=> array(
-                                       'building_types'                        
=> $building_types,
-                                       'category_types'                        
=> $category_types,
-                                       'district_list'                         
=> $district_list,
-                                       'part_of_town_list'     => 
$part_of_town_list
+                                       'view'                                  
                                        => "register_control_to_location",
+                                       'control_areas_array'                   
=> $control_areas_array,
+                                 'controls_array'                          => 
$controls_array,
+                                 'current_control_id'                  => 
$control_id,
+                                       'current_control_area_id' => 
$current_control_area_id,
+                                       'filter_form'                           
                => array(
+                                               'building_types'                
                        => $building_types,
+                                               'category_types'                
                        => $category_types,
+                                               'district_list'                 
                        => $district_list,
+                                               'part_of_town_list'             
        => $part_of_town_list
                                        ),
                                        'datatable' => array(
                                                'source' => 
self::link(array('menuaction' => 'controller.uicontrol_location.index', 
'phpgw_return_as' => 'json', 'view_type' => 
'register_control','control_id_init'    => $control_id)),

Modified: 
trunk/controller/templates/base/control_location/register_control_to_location.xsl
===================================================================
--- 
trunk/controller/templates/base/control_location/register_control_to_location.xsl
   2012-08-20 09:29:01 UTC (rev 9877)
+++ 
trunk/controller/templates/base/control_location/register_control_to_location.xsl
   2012-08-20 11:28:53 UTC (rev 9878)
@@ -43,21 +43,27 @@
                 <div class="error_msg">Du må velge kontroll før du kan legge 
til bygg</div>
                 <h4>Velg kontroll</h4> 
                 <select id="control_area_list" name="control_area_list">
-                       <option value="">Velg kontrollområde</option>
-                       <xsl:for-each select="control_areas_array">
-                               <option value="{id}">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                               </option>
-                       </xsl:for-each>
+                  <option value="">Velg kontrollområde</option>
+                        <xsl:for-each select="control_areas_array">
+                                 <option value="{id}">
+                                   <xsl:if test="id = 
//current_control_area_id">
+                                     <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                   </xsl:if>
+                                   <xsl:value-of select="name"/>
+                                 </option>
+                         </xsl:for-each>
                  </select>
                  
                 <form id="loc_form" action="" method="GET">
                        <select id="control_id" name="control_id">
                                <xsl:choose>
-                                       <xsl:when 
test="control_array/child::node()">
-                                               <xsl:for-each 
select="control_array">
+                                       <xsl:when 
test="controls_array/child::node()">
+                                               <xsl:for-each 
select="controls_array">
                                                        <xsl:variable 
name="control_id"><xsl:value-of select="id"/></xsl:variable>
                                                        <option 
value="{$control_id}">
+                                                         <xsl:if 
test="control_id = //current_control_id">
+                                         <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                       </xsl:if>
                                                                <xsl:value-of 
select="title"/>
                                                        </option>               
                
                                                </xsl:for-each>
@@ -97,7 +103,7 @@
                <li>
                        <input type="hidden" id="hidden_control_id" 
name="control_id">
                                <xsl:attribute name="value">
-                                       <xsl:value-of select="//control_id"/>
+                                       <xsl:value-of 
select="//current_control_id"/>
                                </xsl:attribute>
                        </input>