[Phpgroupware-cvs] property/inc class.uiadmin_entity.inc.php class...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/02/07 08:31:08

Modified files:
        inc            : class.uiadmin_entity.inc.php 
                         class.uientity.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uiadmin_entity.inc.php.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uientity.inc.php.diff?tr1=1.19&tr2=1.20&r1=text&r2=text

Patches:
Index: property/inc/class.uiadmin_entity.inc.php
diff -u property/inc/class.uiadmin_entity.inc.php:1.15 
property/inc/class.uiadmin_entity.inc.php:1.16
--- property/inc/class.uiadmin_entity.inc.php:1.15      Sun Feb  5 20:07:35 2006
+++ property/inc/class.uiadmin_entity.inc.php   Tue Feb  7 08:31:07 2006
@@ -10,7 +10,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage admin
-       * @version $Id: class.uiadmin_entity.inc.php,v 1.15 2006/02/05 20:07:35 
sigurdne Exp $
+       * @version $Id: class.uiadmin_entity.inc.php,v 1.16 2006/02/07 08:31:07 
sigurdne Exp $
        */
 
        /**
@@ -50,9 +50,9 @@
                        $this->currentapp                       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $this->nextmatchs                       = 
CreateObject('phpgwapi.nextmatchs');
                        $this->account                          = 
$GLOBALS['phpgw_info']['user']['account_id'];
-                       $this->bo                                       = 
CreateObject($this->currentapp.'.boadmin_entity',True);
+                       $this->bo                               = 
CreateObject($this->currentapp.'.boadmin_entity',True);
                        $this->bocommon                         = 
CreateObject($this->currentapp.'.bocommon');
-                       $this->menu                                     = 
CreateObject($this->currentapp.'.menu');
+                       $this->menu                             = 
CreateObject($this->currentapp.'.menu');
 
                        $this->start                            = 
$this->bo->start;
                        $this->query                            = 
$this->bo->query;
Index: property/inc/class.uientity.inc.php
diff -u property/inc/class.uientity.inc.php:1.19 
property/inc/class.uientity.inc.php:1.20
--- property/inc/class.uientity.inc.php:1.19    Mon Feb  6 22:47:38 2006
+++ property/inc/class.uientity.inc.php Tue Feb  7 08:31:08 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage entity
-       * @version $Id: class.uientity.inc.php,v 1.19 2006/02/06 22:47:38 
sigurdne Exp $
+       * @version $Id: class.uientity.inc.php,v 1.20 2006/02/07 08:31:08 
sigurdne Exp $
        */
 
        /**
@@ -48,11 +48,11 @@
                        $this->nextmatchs                       = 
CreateObject('phpgwapi.nextmatchs');
                        $this->account                          = 
$GLOBALS['phpgw_info']['user']['account_id'];
 
-                       $this->bo                                       = 
CreateObject($this->currentapp.'.boentity',True);
+                       $this->bo                               = 
CreateObject($this->currentapp.'.boentity',True);
                        $this->bocommon                         = 
CreateObject($this->currentapp.'.bocommon');
-                       $this->menu                                     = 
CreateObject($this->currentapp.'.menu');
+                       $this->menu                             = 
CreateObject($this->currentapp.'.menu');
 
-                       $this->boadmin_entity           = 
CreateObject($this->currentapp.'.boadmin_entity',True);
+                       $this->boadmin_entity                   = 
CreateObject($this->currentapp.'.boadmin_entity',True);
 
                        $this->entity_id                        = 
$this->bo->entity_id;
                        $this->cat_id                           = 
$this->bo->cat_id;
@@ -1231,15 +1231,22 @@
                function attrib_history()
                {
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('entity','nextmatchs'));
                        $GLOBALS['phpgw_info']['flags']['noframework'] = True;
+
+                       $id             = get_var('id',array('POST','GET'));
+                       $entity_id      = 
get_var('entity_id',array('POST','GET'));
+                       $cat_id         = get_var('cat_id',array('POST','GET'));
+                       $attrib_id      = 
get_var('attrib_id',array('POST','GET'));
+
                        $data_lookup= array(
-                               'id'            => 
get_var('id',array('POST','GET')),
-                               'entity_id'     => 
get_var('entity_id',array('POST','GET')),
-                               'cat_id'        => 
get_var('cat_id',array('POST','GET')),
-                               'attrib_id'     => 
get_var('attrib_id',array('POST','GET'))
+                               'id'            => $id,
+                               'entity_id'     => $entity_id,
+                               'cat_id'        => $cat_id,
+                               'attrib_id'     => $attrib_id
                                );
 
                        $delete = get_var('delete',array('POST','GET'));
                        $edit = get_var('edit',array('POST','GET'));
+
                        if ($delete)
                        {
                                $data_lookup['history_id'] = 
get_var('history_id',array('POST','GET'));
@@ -1259,7 +1266,8 @@
                                                'id'            => 
$data_lookup['id'],
                                                'attrib_id'     => 
$data_lookup['attrib_id'],
                                                'history_id'    => $entry['id'],
-                                               'delete'        => true
+                                               'delete'        => true,
+                                               'edit'  => true
                                        );
                                if($edit)
                                {
@@ -1302,9 +1310,12 @@
                                'table_header'                  => 
$table_header,
                        );
 //_debug_array($data);
-                       $appname                                = 
lang('entity');
-                       $function_msg                           = 
lang('attribute history');
-                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('attrib_history' => $data));
+                       $attrib_data    = 
$this->boadmin_entity->read_single_attrib($entity_id,$cat_id,$attrib_id);
+                       $appname        = $attrib_data['input_text'];
+                       $function_msg   = lang('history');
+
+                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
_debug_array($GLOBALS['phpgw_info']['flags']['app_header']);
+                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('attrib_history' => $data));
                }
        }
 ?>