--- MPIWGWeb/MPIWGProjects.py 2008/06/19 11:49:34 1.47.2.81 +++ MPIWGWeb/MPIWGProjects.py 2008/06/20 07:45:57 1.47.2.82 @@ -1346,7 +1346,7 @@ class MPIWGRoot(ZSQLExtendFolder): return ret - def getProjectsOfMember(self,name=None,key=None,date=None,onlyArchived=1): + def getProjectsOfMember(self,name=None,key=None,date=None,onlyArchived=1,onlyActive=1): """get projects of a member @param name: (optional)Vorname + Nachname @param key: (optional) Key zur Idenfikation des Benutzer @@ -1410,16 +1410,30 @@ class MPIWGRoot(ZSQLExtendFolder): for proj in proj2: obj=proj.getObject() + add=False if onlyArchived==1: #nur aktuell projecte if not obj.isArchivedProject(): - projectListe.append(proj) + add=True elif onlyArchived==2: #nur archivierte if obj.isArchivedProject(): - projectListe.append(proj) + add=True else: #alle - projectListe.append(proj) - + add=True + + if onlyActive==1: #nur active projecte + if obj.isActiveProject(): + add=add & True + else: + add=add & False + + elif onlyArchived==2: #nur nicht aktvive + if not obj.isActiveProject(): + add=add & True + else: #alle + add=add & True + if add: + projectListe.append(proj) if len(projectListe)>0: ret.append((name,projectListe))