[Gforge-commits] gforge/common/tracker ArtifactsForUser.class, 1.4, 1.5

[tom]

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

Modified Files:
        ArtifactsForUser.class 
Log Message:
Fixed bug # 792: 'My personal page' submitted items includes those submitted to 
deleted projects

Index: ArtifactsForUser.class
===================================================================
RCS file: /cvsroot/gforge/gforge/common/tracker/ArtifactsForUser.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ArtifactsForUser.class      23 Jun 2003 20:06:19 -0000      1.4
+++ ArtifactsForUser.class      7 May 2004 20:15:54 -0000       1.5
@@ -79,7 +79,7 @@
        */
        function getAssignedArtifactsByGroup() {
                $sql="SELECT * FROM artifact_vw av WHERE 
av.assigned_to=".$this->User->getID()."
-                       AND av.status_id='1' ORDER BY av.artifact_group_id, 
av.group_artifact_id, av.assigned_to, av.status_id";
+                       AND av.status_id='1', ORDER BY av.artifact_group_id, 
av.group_artifact_id, av.assigned_to, av.status_id";
                return $this->getArtifactsFromSQL($sql);
        }
 
@@ -90,9 +90,11 @@
        */
        function getSubmittedArtifactsByGroup() {
                $sql="SELECT *
-                       FROM artifact_vw av
+                       FROM artifact_vw av, groups g
                        WHERE av.submitted_by=".$this->User->getID()."
                        AND av.status_id='1'
+                       AND av.artifact_group_id = g.group_id
+                       AND g.status = 'A'
                        ORDER BY 
av.artifact_group_id,av.group_artifact_id,av.assigned_to,av.status_id";
                return $this->getArtifactsFromSQL($sql);
        }