[Fmsystem-commits] [8276] property: more on responsibility

[Sigurd Nes]

Revision: 8276
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8276
Author:   sigurdne
Date:     2011-12-12 19:49:09 +0000 (Mon, 12 Dec 2011)
Log Message:
-----------
property: more on responsibility

Modified Paths:
--------------
    trunk/property/inc/class.boresponsible.inc.php
    trunk/property/inc/class.sogeneric.inc.php
    trunk/property/inc/class.uigeneric.inc.php

Modified: trunk/property/inc/class.boresponsible.inc.php
===================================================================
--- trunk/property/inc/class.boresponsible.inc.php      2011-12-12 15:13:21 UTC 
(rev 8275)
+++ trunk/property/inc/class.boresponsible.inc.php      2011-12-12 19:49:09 UTC 
(rev 8276)
@@ -209,16 +209,16 @@
                        $selected       = isset($data['selected']) && 
$data['selected'] ? $data['selected'] : '';
                        $values = $this->so->read_type(array('start' => 
$this->start, 'query' => $this->query, 'sort' => $this->sort,
                                'order' => $this->order, 'location' => '', 
'allrows'=>true,
-                               'filter' => $filter));
+                               'filter' => $filter, 'appname' => 
$data['appname']));
                        $responsibilities = array();
                        foreach($values as  $value)
                        {
                                $responsibilities[] = array
-                                       (
-                                               'id'            => $value['id'],
-                                               'name'          => 
$value['name'],
-                                               'selected'      => $value['id'] 
== $selected ? 1 : 0
-                                       );
+                               (
+                                       'id'            => $value['id'],
+                                       'name'          => $value['name'],
+                                       'selected'      => $value['id'] == 
$selected ? 1 : 0
+                               );
                        }
 
                        return $responsibilities;

Modified: trunk/property/inc/class.sogeneric.inc.php
===================================================================
--- trunk/property/inc/class.sogeneric.inc.php  2011-12-12 15:13:21 UTC (rev 
8275)
+++ trunk/property/inc/class.sogeneric.inc.php  2011-12-12 19:49:09 UTC (rev 
8276)
@@ -1928,7 +1928,7 @@
                                                                (
                                                                        
'valueset'              => false,
                                                                        
'method'                => 'property.boresponsible.get_responsibilities',
-                                                                       
'method_input'  => array('acl_app' => 'property',       'selected' => 
'##responsibility_id##')
+                                                                       
'method_input'  => array('appname' => '$this->appname', 'selected' => 
'##responsibility_id##')
                                                                )
                                                        )
                                                ),

Modified: trunk/property/inc/class.uigeneric.inc.php
===================================================================
--- trunk/property/inc/class.uigeneric.inc.php  2011-12-12 15:13:21 UTC (rev 
8275)
+++ trunk/property/inc/class.uigeneric.inc.php  2011-12-12 19:49:09 UTC (rev 
8276)
@@ -317,9 +317,13 @@
                                                                        
$_argument_value_name = trim($_argument_value,'#');
                                                                        
$_argument_value = $values[$_argument_value_name];
                                                                }
+                                                               
if(preg_match('/^\$this->/', $_argument_value))
+                                                               {
+                                                                       
$_argument_value_name = ltrim($_argument_value,'$this->');
+                                                                       
$_argument_value = $this->$_argument_value_name;
+                                                               }               
                                                
                                                                
$method_input[$_argument] = $_argument_value;
                                                        }
-
                                                        $values_combo_box[] = 
execMethod($field['values_def']['method'],$method_input);
                                                }
                                                $default_value = array 
('id'=>'','name'=> lang('select') . ' ' . $field['descr']);
@@ -815,6 +819,12 @@
                                                                
$_argument_value_name = trim($_argument_value,'#');
                                                                
$_argument_value = $values[$_argument_value_name];
                                                        }
+                                                       
if(preg_match('/^\$this->/', $_argument_value))
+                                                       {
+                                                               
$_argument_value_name = ltrim($_argument_value,'$this->');
+                                                               
$_argument_value = $this->$_argument_value_name;
+                                                       }
+
                                                        
$method_input[$_argument] = $_argument_value;
                                                }