[Phpgroupware-cvs] property/inc/class.sodocument.inc.php, 1.3

[nomail]

Update of /property/inc
Modified Files:
        Branch: 
          class.sodocument.inc.php

date: 2004/10/21 19:54:15;  author: sigurdne;  state: Exp;  lines: +39 -37

Log Message:
no message
=====================================================================
Index: property/inc/class.sodocument.inc.php
diff -u property/inc/class.sodocument.inc.php:1.2 
property/inc/class.sodocument.inc.php:1.3
--- property/inc/class.sodocument.inc.php:1.2   Wed Jun  2 18:54:28 2004
+++ property/inc/class.sodocument.inc.php       Thu Oct 21 19:54:15 2004
@@ -109,55 +109,50 @@
                        if(!$sql)
                        {
 
-                       $document_table = 'fm_document';
+                               $document_table = 'fm_document';
 
-                       $cols .= $document_table . '.location_code';
-                       $cols_return[] = 'location_code';
+                               $cols .= $document_table . '.location_code';
+                               $cols_return[] = 'location_code';
 
-//                     $cols .= ",$document_table.id as document_id";
-//                     $cols_return[]                          = 'document_id';
+//                             $cols .= ",$document_table.id as document_id";
+//                             $cols_return[]                          = 
'document_id';
 
-                       $groupmethod= " GROUP BY 
fm_document.location_code,fm_document.address  ";
-
-                       if ($entity_id)
-                       {
-                               $cols .= ",$document_table.p_num as p_num";
-                               $cols_return[]                          = 
'p_num';
-                               $uicols['input_type'][]         = 'text';
-                               $uicols['name'][]                       = 
'p_num';
-                               $uicols['descr'][]                      = 
lang('ID');
-                               $uicols['statustext'][]         = lang('ID');
-
-                               $cols .= ',fm_entity_category.name as category';
-                               $cols_return[]                          = 
'category';
-                               $uicols['input_type'][]         = 'text';
-                               $uicols['name'][]                       = 
'category';
-                               $uicols['descr'][]                      = 
lang('Type');
-                               $uicols['statustext'][]         = lang('Type');
+                               if ($entity_id)
+                               {
+                                       $cols .= ",$document_table.p_num as 
p_num";
+                                       $cols_return[]                          
= 'p_num';
+                                       $uicols['input_type'][]         = 
'text';
+                                       $uicols['name'][]                       
= 'p_num';
+                                       $uicols['descr'][]                      
= lang('ID');
+                                       $uicols['statustext'][]         = 
lang('ID');
 
-                               $cols .= ",$document_table.p_entity_id";
-                               $cols_return[]                          = 
'p_entity_id';
-                               $cols .= ",$document_table.p_cat_id";
-                               $cols_return[]                          = 
'p_cat_id';
+                                       $cols .= ',fm_entity_category.name as 
category';
+                                       $cols_return[]                          
= 'category';
+                                       $uicols['input_type'][]         = 
'text';
+                                       $uicols['name'][]                       
= 'category';
+                                       $uicols['descr'][]                      
= lang('Type');
+                                       $uicols['statustext'][]         = 
lang('Type');
 
-                               $joinmethod .= " $this->join  
fm_entity_category ON (fm_entity_category.entity_id 
=$document_table.p_entity_id AND fm_entity_category.id = 
$document_table.p_cat_id))";
-                               $paranthesis .='(';
+                                       $cols .= ",$document_table.p_entity_id";
+                                       $cols_return[]                          
= 'p_entity_id';
+                                       $cols .= ",$document_table.p_cat_id";
+                                       $cols_return[]                          
= 'p_cat_id';
 
+                                       $joinmethod .= " $this->join  
fm_entity_category ON (fm_entity_category.entity_id 
=$document_table.p_entity_id AND fm_entity_category.id = 
$document_table.p_cat_id))";
+                                       $paranthesis .='(';
 
-                               $groupmethod.= " 
,fm_document.p_entity_id,fm_entity_category.name,$document_table.p_num,fm_document.p_cat_id";
-                       }
+                               }
 
 
-                       $sql    = 
$this->bocommon->generate_sql(array('entity_table'=>$document_table,'cols'=>$cols,'cols_return'=>$cols_return,
+                               $sql    = 
$this->bocommon->generate_sql(array('entity_table'=>$document_table,'cols'=>$cols,'cols_return'=>$cols_return,
                                                                                
                                
'uicols'=>$uicols,'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,'query'=>$query));
 
+                               $this->bocommon->fm_cache('sql_document_' . 
$entity_id,$sql);
 
-                       $this->bocommon->fm_cache('sql_document_' . 
$entity_id,$sql);
-
-                       $this->uicols           = $this->bocommon->uicols;
-                       $cols_return            = $this->bocommon->cols_return;
-                       $type_id                        = 
$this->bocommon->type_id;
-                       $this->cols_extra       = $this->bocommon->cols_extra;
+                               $this->uicols           = 
$this->bocommon->uicols;
+                               $cols_return            = 
$this->bocommon->cols_return;
+                               $type_id                        = 
$this->bocommon->type_id;
+                               $this->cols_extra       = 
$this->bocommon->cols_extra;
 
                                $this->bocommon->fm_cache('uicols_document_' . 
$entity_id,$this->uicols);
                                
$this->bocommon->fm_cache('cols_return_document_' . $entity_id,$cols_return);
@@ -173,6 +168,13 @@
                                $this->cols_extra       = 
$this->bocommon->fm_cache('cols_extra_document_' . $entity_id);
                        }
 
+                       $groupmethod= " GROUP BY 
fm_document.location_code,fm_document.address  ";
+
+                       if ($entity_id)
+                       {
+
+                               $groupmethod.= " 
,fm_document.p_entity_id,fm_entity_category.name,fm_document.p_num,fm_document.p_cat_id";
+                       }
 
                        if ($order)
                        {