--- MPIWGWeb/MPIWGProjects.py	2006/01/16 15:21:47	1.47.2.47
+++ MPIWGWeb/MPIWGProjects.py	2006/05/18 13:00:26	1.47.2.52
@@ -852,7 +852,7 @@ class MPIWGRoot(ZSQLExtendFolder):
                 
                 done= obj.updateDBEntry(DBid=id,publish_the_data=publish_the_data,
                                    date_from=date_from,
-                                   date_to=date_to,stay_at_mpiwg=stay_at_mpiwg,position=position)
+                                   date_to=date_to,stay_at_mpiwg=stay_at_mpiwg,position=position,abteilung=abteilung)
                 if not done and (publish_the_data=='yes'):
                         
                     ret=obj.createNewDBEntry(publish_the_data,id,name,
@@ -888,6 +888,7 @@ class MPIWGRoot(ZSQLExtendFolder):
             
         
     
+        
            
         if RESPONSE:
             RESPONSE.redirect('manage_main')
@@ -933,25 +934,35 @@ class MPIWGRoot(ZSQLExtendFolder):
             RESPONSE.redirect('manage_main')
 
         
-    def getAllMembers(self):
-        """give list of all members"""
-        ret=[]
+#    def getAllMembers(self,reset=None):
+#        """give list of all members"""
+#        ret=[]
+#
+#
+#        if reset or (getattr(self,'_v_membersList',None) is None):
+#            for member in self.members._objects:
+#                if member['meta_type']=='MPIWGStaff':
+#                    memberObj=getattr(self.members,member['id'])
+#                    if memberObj.isPublished():
+#                           ret.append(memberObj.title.decode('utf-8'))
+#            
+#            ret.sort()
+#            self._v_membersList=ret[0:]
+#        print ret
+#  
+#        return self._v_membersList
 
-        #for x in self.members.objectValues('MPIWGStaff'):
-            #print x.title
-        #    ret.append(x.title.decode('utf-8'))
-
-        for x in self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff']):
-            if x[1].isPublished():
-                               ret.append(x[1].title.decode('utf-8'))
-            
-        ret.sort()
-        #print ret
-  
+    def getAllMembers(self):
+        #ret=[]
+        
+        results=self.MembersCatalog({'isPublished':True})
+ 
+        ret=[", ".join([proj.lastName, proj.firstName]).decode('utf-8') for proj in results]
+        
+	ret.sort()
         return ret
-
     def printAllMembers(self):
-        """prin"""
+        """print"""
         members=self.getAllMembers()
         ret=""
         for x in members:
@@ -1030,7 +1041,7 @@ class MPIWGRoot(ZSQLExtendFolder):
             ret+="""<li>\n"""
             
             if actualDepth==1:
-                departmentName={'1':'Department I','2':'Department II','3':'Department III', '4':'Ind. Research Group','5':'Ind. Research Group','6':'Research Network'} 
+                departmentName={'1':'Department I','2':'Department II','3':'Department III', '4':'Ind. Research Group','5':'Ind. Research Group','6':'Ind. Research Group','7':'Research Network'} 
                 department=element[3].getContent('xdata_05')
                 ret+="""<a href="#top"><img src="../grafik/totop.gif" vspace="10" border="0"></a><br><a name="dept%s"></a>%s: """%(department,departmentName[department])
 
@@ -1186,8 +1197,10 @@ class MPIWGRoot(ZSQLExtendFolder):
         """give tuple member /projects"""
         ret=[]
         members=self.getAllMembers()
+       
         #return str(members)
         for x in members:
+         
             ret+=self.getProjectsOfMember(name=x,date=date)
             
         return ret