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

[nomail]

Update of /property/inc
Modified Files:
        Branch: proposed-0_9_18-branch
          class.sodocument.inc.php

date: 2004/11/08 13:57:50;  author: sigurdne;  state: Exp;  lines: +11 -9

Log Message:
no message
=====================================================================
Index: property/inc/class.sodocument.inc.php
diff -u property/inc/class.sodocument.inc.php:1.3.2.1 
property/inc/class.sodocument.inc.php:1.3.2.2
--- property/inc/class.sodocument.inc.php:1.3.2.1       Sun Nov  7 20:37:01 2004
+++ property/inc/class.sodocument.inc.php       Mon Nov  8 13:57:50 2004
@@ -102,6 +102,7 @@
                                $order = 
(isset($data['order'])?$data['order']:'');
                                $cat_id = 
(isset($data['cat_id'])?$data['cat_id']:0);
                                $entity_id = 
(isset($data['entity_id'])?$data['entity_id']:'');
+                               $doc_type = 
(isset($data['doc_type'])?$data['doc_type']:0);
                        }
 
                        $sql = $this->bocommon->fm_cache('sql_document_' . 
$entity_id);
@@ -111,13 +112,8 @@
 
                                $document_table = 'fm_document';
 
-                               $cols .= $document_table . '.location_code, 
document_name';
+                               $cols .= $document_table . '.location_code';
                                $cols_return[] = 'location_code';
-                               $cols_return[] = 'document_name';
-                               $uicols['input_type'][]         = 'text';
-                               $uicols['name'][]                       = 
'document_name';
-                               $uicols['descr'][]                      = 
lang('Name');
-                               $uicols['statustext'][]         = lang('Name');
 
 //                             $cols .= ",$document_table.id as document_id";
 //                             $cols_return[]                          = 
'document_id';
@@ -173,12 +169,12 @@
                                $this->cols_extra       = 
$this->bocommon->fm_cache('cols_extra_document_' . $entity_id);
                        }
 
-//                     $groupmethod= " GROUP BY 
fm_document.location_code,fm_document.address  ";
+                       $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";
+                               $groupmethod.= " 
,fm_document.p_entity_id,fm_entity_category.name,fm_document.p_num,fm_document.p_cat_id";
                        }
 
                        if ($order)
@@ -204,6 +200,12 @@
                                $where= 'AND';
                        }
 
+                       if ($doc_type > 0)
+                       {
+                               $filtermethod .= " $where 
fm_document.category='$doc_type' ";
+                               $where= 'AND';
+                       }
+
                        if ($filter!='all' && $filter)
                        {
                                $filtermethod .= " $where 
fm_document.user_id='$filter' ";
@@ -281,7 +283,7 @@
                                $ordermethod = ' order by location_code ASC';
                        }
 
-                       $filtermethod = " 
fm_document.location_code='$location_code'";
+                       $filtermethod = " fm_document.location_code LIKE 
'%$location_code%'";
 
                        if ($doc_type > 0)
                        {