[Phpgroupware-cvs] property/inc class.soproject.inc.php class.uipr...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/10/17 13:47:11

Modified files:
        inc            : class.soproject.inc.php class.uiproject.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soproject.inc.php?cvsroot=phpgroupware&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiproject.inc.php?cvsroot=phpgroupware&r1=1.42&r2=1.43

Patches:
Index: class.soproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- class.soproject.inc.php     10 Oct 2006 09:53:44 -0000      1.36
+++ class.soproject.inc.php     17 Oct 2006 13:47:11 -0000      1.37
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage project
-       * @version $Id: class.soproject.inc.php,v 1.36 2006/10/10 09:53:44 
sigurdne Exp $
+       * @version $Id: class.soproject.inc.php,v 1.37 2006/10/17 13:47:11 
sigurdne Exp $
        */
 
        /**
@@ -104,7 +104,7 @@
                                {
                                        $start=0;
                                }
-                               $filter = 
$data['filter']?$data['filter']:$this->account;
+                               $filter = $data['filter']?$data['filter']:'all';
                                $query = 
(isset($data['query'])?$data['query']:'');
                                $sort = 
(isset($data['sort'])?$data['sort']:'DESC');
                                $order = 
(isset($data['order'])?$data['order']:'');
@@ -243,14 +243,14 @@
                                                $public_user_list[] = $user;
                                        }
                                        reset($public_user_list);
-                                       $filtermethod .= " $where 
(fm_project.coordinator IN(" . implode(',',$public_user_list) . "))";
+                                       $filtermethod .= " $where 
(fm_project.user_id IN(" . implode(',',$public_user_list) . "))";
 
                                        $where= 'AND';
                                }
                        }
                        else
                        {
-                               $filtermethod .= " $where 
fm_project.coordinator=$filter ";
+                               $filtermethod .= " $where 
fm_project.user_id=$filter ";
                                $where= 'AND';
                        }
 

Index: class.uiproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- class.uiproject.inc.php     10 Oct 2006 13:11:26 -0000      1.42
+++ class.uiproject.inc.php     17 Oct 2006 13:47:11 -0000      1.43
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage project
-       * @version $Id: class.uiproject.inc.php,v 1.42 2006/10/10 13:11:26 
sigurdne Exp $
+       * @version $Id: class.uiproject.inc.php,v 1.43 2006/10/17 13:47:11 
sigurdne Exp $
        */
 
        /**
@@ -410,7 +410,7 @@
                                'lang_user_statustext'          => lang('Select 
the user the project belongs to. To do not use a category select NO USER'),
                                'select_user_name'              => 'filter',
                                'lang_no_user'                  => lang('No 
user'),
-                               'user_list'                     => 
$this->bocommon->get_user_list_right2('filter',4,$this->filter,$this->acl_location,array('all'),$default=$this->account),
+                               'user_list'                     => 
$this->bocommon->get_user_list_right2('filter',4,$this->filter,$this->acl_location),
 
                                'lang_searchfield_statustext'   => lang('Enter 
the search string. To show all entries, empty this field and press the SUBMIT 
button again'),
                                'lang_searchbutton_statustext'  => lang('Submit 
the search string'),