[Gforge-commits] %s

[Christian Bayle,,,]

Update of /cvsroot/gforge/gforge/common/pm
In directory db.perdue.net:/tmp/cvs-serv18912/common/pm

Modified Files:
        ProjectTaskFactory.class 
Log Message:
added 'Nice' Patch to add Detail view to Task Manager [#1025]
        proposed by  Steel City Phantom,


Index: ProjectTaskFactory.class
===================================================================
RCS file: /cvsroot/gforge/gforge/common/pm/ProjectTaskFactory.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ProjectTaskFactory.class    27 Nov 2004 20:04:44 -0000      1.7
--- ProjectTaskFactory.class    20 Jan 2005 00:33:36 -0000      1.8
***************
*** 35,38 ****
--- 35,39 ----
  require_once('common/include/Error.class');
  require_once('common/pm/ProjectTask.class');
+ require_once('www/pm/include/ProjectTaskHTML.class');
  
  class ProjectTaskFactory extends Error {
***************
*** 58,61 ****
--- 59,63 ----
        var $max_rows;
        var $fetched_rows;
+       var $view_type;
  
        /**
***************
*** 91,96 ****
         *      @param  int     Include this param if you want to limit to a 
certain assignee.
         *      @param  int     Include this param if you want to limit to a 
certain category.
         */
!       function 
setup($offset,$order,$max_rows,$set,$_assigned_to,$_status,$_category_id) {
  //echo "<BR>offset: $offset| order: $order|max_rows: $max_rows|_assigned_to: 
$_assigned_to|_status: $_status|_category_id: $_category_id +";
                if ((!$offset) || ($offset < 0)) {
--- 93,99 ----
         *      @param  int     Include this param if you want to limit to a 
certain assignee.
         *      @param  int     Include this param if you want to limit to a 
certain category.
+        *      @param  string  What view mode the screen should be in.
         */
!       function 
setup($offset,$order,$max_rows,$set,$_assigned_to,$_status,$_category_id,$_view)
 {
  //echo "<BR>offset: $offset| order: $order|max_rows: $max_rows|_assigned_to: 
$_assigned_to|_status: $_status|_category_id: $_category_id +";
                if ((!$offset) || ($offset < 0)) {
***************
*** 127,131 ****
                                if this custom set is different than the stored 
one, reset preference
                        */
!                       $pref_=$_assigned_to.'|'.$_status.'|'.$_category_id;
                        if (session_loggedin() && ($pref_ != 
$u->getPreference('pm_brow_cust'.$this->ProjectGroup->Group->getID()))) {
                                //echo 'setting pref';
--- 130,134 ----
                                if this custom set is different than the stored 
one, reset preference
                        */
!                       
$pref_=$_assigned_to.'|'.$_status.'|'.$_category_id.'|'.$_view;
                        if (session_loggedin() && ($pref_ != 
$u->getPreference('pm_brow_cust'.$this->ProjectGroup->Group->getID()))) {
                                //echo 'setting pref';
***************
*** 139,142 ****
--- 142,146 ----
                                        $_status=$prf_arr[1];
                                        $_category_id=$prf_arr[2];
+                                       $_view=$prf_arr[3];
                                }
                        }
***************
*** 145,148 ****
--- 149,153 ----
                $this->assigned_to=$_assigned_to;
                $this->category=$_category_id;
+               $this->view_type=$_view;
  
                if (!$max_rows || $max_rows < 5) {
***************
*** 156,161 ****
         *
         *      @return array   The array of ProjectTask objects.
         */
!       function &getTasks() {
                if ($this->project_tasks) {
                        return $this->project_tasks;
--- 161,167 ----
         *
         *      @return array   The array of ProjectTask objects.
+        *      @param  bool    True will create an array of ProjectTaskHTML 
instead of ProjectTask objects.
         */
!       function &getTasks($htmlobjs=false) {
                if ($this->project_tasks) {
                        return $this->project_tasks;
***************
*** 216,220 ****
                } else {
                        while ($arr =& db_fetch_array($result)) {
!                               $this->project_tasks[] = new 
ProjectTask($this->ProjectGroup, $arr['project_task_id'], $arr);
                        }
                }
--- 222,229 ----
                } else {
                        while ($arr =& db_fetch_array($result)) {
!                               if (!$htmlobjs)
!                                       $this->project_tasks[] = new 
ProjectTask($this->ProjectGroup, $arr['project_task_id'], $arr);
!                               else
!                                       $this->project_tasks[] = new 
ProjectTaskHTML($this->ProjectGroup,$arr['project_task_id']);
                        }
                }