[Fmsystem-commits] [7617]

[Torstein]

Revision: 7617
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7617
Author:   vator
Date:     2011-09-16 08:21:17 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/model/class.control_item.inc.php
    trunk/controller/inc/model/class.control_type.inc.php

Modified: trunk/controller/inc/model/class.control_item.inc.php
===================================================================
--- trunk/controller/inc/model/class.control_item.inc.php       2011-09-16 
08:21:05 UTC (rev 7616)
+++ trunk/controller/inc/model/class.control_item.inc.php       2011-09-16 
08:21:17 UTC (rev 7617)
@@ -11,7 +11,7 @@
                protected $what_to_do;
                protected $how_to_do;
                protected $control_group_id;
-               protected $control_type_id;
+               protected $control_area_id;
                
                /**
                 * Constructor.  Takes an optional ID.  If a contract is 
created from outside
@@ -66,12 +66,12 @@
                
                public function get_control_group_id() { return 
$this->control_group_id; }
                
-               public function set_control_type_id($control_type_id)
+               public function set_control_area_id($control_area_id)
                {
-                       $this->control_type_id = $control_type_id;
+                       $this->control_area_id = $control_area_id;
                }
                
-               public function get_control_type_id() { return 
$this->control_type_id; }
+               public function get_control_area_id() { return 
$this->control_area_id; }
                
                        
                /**
@@ -97,7 +97,7 @@
                        $result['what_to_do'] = $this->get_what_to_do();
                        $result['how_to_do'] = $this->get_how_to_do();
                        $result['control_group_id'] = 
$this->get_control_group_id();
-                       $result['control_type_id'] = 
$this->get_control_type_id();
+                       $result['control_area_id'] = 
$this->get_control_area_id();
                                                
                        return $result;
                }

Modified: trunk/controller/inc/model/class.control_type.inc.php
===================================================================
--- trunk/controller/inc/model/class.control_type.inc.php       2011-09-16 
08:21:05 UTC (rev 7616)
+++ trunk/controller/inc/model/class.control_type.inc.php       2011-09-16 
08:21:17 UTC (rev 7617)
@@ -1,7 +1,7 @@
 <?php
        include_class('controller', 'model', 'inc/model/');
        
-       class controller_control_type extends controller_model
+       class controller_control_area extends controller_model
        {
                public static $so;
 
@@ -41,7 +41,7 @@
                public static function get_so()
                {
                        if (self::$so == null) {
-                               self::$so = 
CreateObject('controller_control_type');
+                               self::$so = 
CreateObject('controller_control_area');
                        }
                        
                        return self::$so;