[Fmsystem-commits] [6961] property: show selectbox at uilocation:: responsiblility_role based on credentials

[Sigurd Nes]

Revision: 6961
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6961
Author:   sigurdne
Date:     2011-02-10 08:56:21 +0000 (Thu, 10 Feb 2011)
Log Message:
-----------
property: show selectbox at uilocation::responsiblility_role based on 
credentials

Modified Paths:
--------------
    trunk/property/inc/class.bolocation.inc.php
    trunk/property/inc/class.uilocation.inc.php

Modified: trunk/property/inc/class.bolocation.inc.php
===================================================================
--- trunk/property/inc/class.bolocation.inc.php 2011-02-10 08:08:28 UTC (rev 
6960)
+++ trunk/property/inc/class.bolocation.inc.php 2011-02-10 08:56:21 UTC (rev 
6961)
@@ -675,38 +675,6 @@
                                $location['responsible_contact_id'] = 
$responsible_item['contact_id'];
                        }
 
-                       $this->uicols['name'][]                 = 
'responsible_contact';
-                       $this->uicols['descr'][]                = 
lang('responsible');
-                       $this->uicols['sortable'][]             = false;
-                       $this->uicols['sort_field'][]   = '';
-                       $this->uicols['format'][]               = '';
-                       $this->uicols['formatter'][]    = '';
-                       $this->uicols['input_type'][]   = '';
-
-                       $this->uicols['name'][]                 = 
'responsible_contact_id';
-                       $this->uicols['descr'][]                = 'dummy';
-                       $this->uicols['sortable'][]             = false;
-                       $this->uicols['sort_field'][]   = '';
-                       $this->uicols['format'][]               = '';
-                       $this->uicols['formatter'][]    = '';
-                       $this->uicols['input_type'][]   = 'hidden';
-
-                       $this->uicols['name'][]                 = 
'responsible_item';
-                       $this->uicols['descr'][]                = 'dummy';
-                       $this->uicols['sortable'][]             = false;
-                       $this->uicols['sort_field'][]   = '';
-                       $this->uicols['format'][]               = '';
-                       $this->uicols['formatter'][]    = '';
-                       $this->uicols['input_type'][]   = 'hidden';
-
-                       $this->uicols['name'][]                 = 'select';
-                       $this->uicols['descr'][]                = 
lang('select');
-                       $this->uicols['sortable'][]             = false;
-                       $this->uicols['sort_field'][]   = '';
-                       $this->uicols['format'][]               = '';
-                       $this->uicols['formatter'][]    = 'myFormatterCheck';
-                       $this->uicols['input_type'][]   = '';
-
                        //_debug_array($locations);
 
                        return $locations;

Modified: trunk/property/inc/class.uilocation.inc.php
===================================================================
--- trunk/property/inc/class.uilocation.inc.php 2011-02-10 08:08:28 UTC (rev 
6960)
+++ trunk/property/inc/class.uilocation.inc.php 2011-02-10 08:56:21 UTC (rev 
6961)
@@ -1347,6 +1347,39 @@
 
                        $uicols = $this->bo->uicols;
 
+                       $uicols['name'][]                       = 
'responsible_contact';
+                       $uicols['descr'][]              = lang('responsible');
+                       $uicols['sortable'][]           = false;
+                       $uicols['sort_field'][] = '';
+                       $uicols['format'][]             = '';
+                       $uicols['formatter'][]  = '';
+                       $uicols['input_type'][] = '';
+
+                       $uicols['name'][]                       = 
'responsible_contact_id';
+                       $uicols['descr'][]              = 'dummy';
+                       $uicols['sortable'][]           = false;
+                       $uicols['sort_field'][] = '';
+                       $uicols['format'][]             = '';
+                       $uicols['formatter'][]  = '';
+                       $uicols['input_type'][] = 'hidden';
+
+                       $uicols['name'][]                       = 
'responsible_item';
+                       $uicols['descr'][]              = 'dummy';
+                       $uicols['sortable'][]           = false;
+                       $uicols['sort_field'][] = '';
+                       $uicols['format'][]             = '';
+                       $uicols['formatter'][]  = '';
+                       $uicols['input_type'][] = 'hidden';
+
+                       $uicols['name'][]                       = 'select';
+                       $uicols['descr'][]              = lang('select');
+                       $uicols['sortable'][]           = false;
+                       $uicols['sort_field'][] = '';
+                       $uicols['format'][]             = '';
+                       $uicols['formatter'][]  = $this->acl_edit ? 
'myFormatterCheck' : '';
+                       $uicols['input_type'][] = '';
+
+
                        $content = array();
                        $j=0;
                        if (isset($location_list) && is_array($location_list))