[Phpgroupware-cvs] property/inc class.soentity.inc.php class.uient...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/10/19 07:57:36

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

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soentity.inc.php?cvsroot=phpgroupware&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uientity.inc.php?cvsroot=phpgroupware&r1=1.32&r2=1.33

Patches:
Index: class.soentity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soentity.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- class.soentity.inc.php      18 Oct 2006 09:11:44 -0000      1.23
+++ class.soentity.inc.php      19 Oct 2006 07:57:36 -0000      1.24
@@ -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.soentity.inc.php,v 1.23 2006/10/18 09:11:44 
sigurdne Exp $
+       * @version $Id: class.soentity.inc.php,v 1.24 2006/10/19 07:57:36 
sigurdne Exp $
        */
 
        /**
@@ -737,11 +737,8 @@
                        $this->db->query("SELECT helpmsg FROM 
fm_entity_attribute WHERE entity_id ='$entity_id' AND cat_id ='$cat_id' AND id 
= '$attrib_id'");
 
                        $this->db->next_record();
-//                     $helpmsg = str_replace("\n"," 
",stripslashes($this->db->f('helpmsg')));
-                       $helpmsg = stripslashes($this->db->f('helpmsg'));
+                       $helpmsg = 
str_replace("\n","</br>",stripslashes($this->db->f('helpmsg')));
                        return $helpmsg;
                }
-
-               
        }
 ?>

Index: class.uientity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- class.uientity.inc.php      18 Oct 2006 09:11:44 -0000      1.32
+++ class.uientity.inc.php      19 Oct 2006 07:57:36 -0000      1.33
@@ -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.32 2006/10/18 09:11:44 
sigurdne Exp $
+       * @version $Id: class.uientity.inc.php,v 1.33 2006/10/19 07:57:36 
sigurdne Exp $
        */
 
        /**
@@ -992,7 +992,7 @@
                                'lang_entity'                                   
=> lang('entity'),
                                'entity_name'                                   
=> $entity['name'],
                                'lang_category'                                 
=> lang('category'),
-                               'category_name'                                 
=> $category['name'],
+                               'category_name'                                 
=> $category['name'] . ' - ' . $category['descr'],
                                'msgbox_data'                                   
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
                                'lang_dateformat'                               
=> lang(strtolower($dateformat)),
                                'dateformat_validate'                   => 
$dateformat_validate,
@@ -1036,8 +1036,9 @@
 
                function attrib_help()
                {
-                       $GLOBALS['phpgw']->xslttpl->add_file(array('entity'));
-                       $GLOBALS['phpgw_info']['flags']['noframework'] = True;
+                       $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
+//                     $GLOBALS['phpgw']->xslttpl->add_file(array('entity'));
+//                     $GLOBALS['phpgw_info']['flags']['noframework'] = True;
 
 
                        $entity_id      = 
get_var('entity_id',array('POST','GET'));
@@ -1050,14 +1051,21 @@
                                'attrib_id'     => $attrib_id
                                );
 
+                       $boadmin_entity = 
CreateObject($this->currentapp.'.boadmin_entity');
+
+                       $entity_category = 
$boadmin_entity->read_single_category($entity_id,$cat_id);
+
                        $help_msg       = 
$this->bo->read_attrib_help($data_lookup);
 
                        $attrib_data    = 
$this->boadmin_entity->read_single_attrib($entity_id,$cat_id,$attrib_id);
-                       $appname        = $attrib_data['input_text'];
+                       $attrib_name    = $attrib_data['input_text'];
                        $function_msg   = lang('Help');
 
-                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
-                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('attrib_help' => $help_msg));
+                       echo '<H2>' . $function_msg . ':</BR>' . 
$entity_category['descr'] .  ' - "' . $attrib_name . '": ' . '</H2>';
+                       echo $help_msg;
+
+//                     $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
+//                     
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('attrib_help' => $help_msg));
                }
                
                function delete()