[Fmsystem-commits] [9605] controller: register control til component

[Sigurd Nes]

Revision: 9605
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9605
Author:   sigurdne
Date:     2012-06-17 08:50:05 +0000 (Sun, 17 Jun 2012)
Log Message:
-----------
controller: register control til component

Modified Paths:
--------------
    trunk/property/inc/class.boentity.inc.php
    trunk/property/inc/class.soentity.inc.php

Modified: trunk/property/inc/class.boentity.inc.php
===================================================================
--- trunk/property/inc/class.boentity.inc.php   2012-06-17 08:49:11 UTC (rev 
9604)
+++ trunk/property/inc/class.boentity.inc.php   2012-06-17 08:50:05 UTC (rev 
9605)
@@ -359,7 +359,7 @@
                                
'end_date'=>$this->bocommon->date_to_timestamp($data['end_date']),
                                'dry_run'=>$data['dry_run'], 
'type'=>$data['type'], 'location_code' => $this->location_code,
                                'criteria_id' => $this->criteria_id, 
'attrib_filter' => $attrib_filter, 'p_num' => $this->p_num,
-                               
'control_registered'=>isset($data['control_registered'])?$data['control_registered']:''));
+                               
'control_registered'=>isset($data['control_registered'])?$data['control_registered']:'','control_id'=>isset($data['control_id'])?$data['control_id']:''));
 
                        $this->total_records = $this->so->total_records;
                        $this->uicols   = $this->so->uicols;

Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php   2012-06-17 08:49:11 UTC (rev 
9604)
+++ trunk/property/inc/class.soentity.inc.php   2012-06-17 08:50:05 UTC (rev 
9605)
@@ -242,6 +242,7 @@
                        $p_num                  = isset($data['p_num']) ? 
$data['p_num'] : '';
                        $custom_condition= isset($data['custom_condition']) ? 
$data['custom_condition'] : '';
                        $control_registered= isset($data['control_registered']) 
? $data['control_registered'] : '';
+                       $control_id             = isset($data['control_id']) && 
$data['control_id'] ? $data['control_id'] : 0;
 
                        if(!$entity_id || !$cat_id)
                        {
@@ -694,6 +695,8 @@
                        {
                                $sql .= "{$this->join} 
controller_control_component_list ON (fm_bim_item.id = 
controller_control_component_list.component_id  AND 
controller_control_component_list.location_id = fm_bim_type.location_id)";
                                $sql_cnt_control_fields = ',control_id ';
+                               $filtermethod .= " $where  
controller_control_component_list.control_id = $control_id";
+                               $where = 'AND';
                        }
                        else
                        {