--- MPIWGWeb/MPIWGProjects.py 2005/05/27 22:12:29 1.47.2.8 +++ MPIWGWeb/MPIWGProjects.py 2005/06/08 20:00:16 1.47.2.11 @@ -103,7 +103,7 @@ class MPIWGTemplate(ZopePageTemplate): return "aktiv" else: return "" - + def manage_addMPIWGTemplateForm(self): """Form for adding""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/AddMPIWGTemplate.zpt')).__of__(self) @@ -418,14 +418,19 @@ class MPIWGRoot(ZSQLExtendFolder): def getProjectsByFieldContent(self,fieldName,fieldContentsEntry): """gib alle Projekte aus mit Value von field mit fieldName enthält ein Element der Liste fieldContents""" - if type(fieldContentsEntry) is StringType: + def sort(x,y): + return cmp(x.WEB_title[0],y.WEB_title[0]) + + if type(fieldContentsEntry) is StringType: fieldContents=[fieldContentsEntry] else: fieldContents=fieldContentsEntry projects=self.ProjectCatalog({fieldName:string.join(fieldContents,' OR')}) #print projects - return projects + ret=[x for x in projects] + ret.sort(sort) + return ret def changeMPIWGRootForm(self): """edit""" @@ -639,7 +644,8 @@ class MPIWGRoot(ZSQLExtendFolder): #title=project[0].WEB_title title=[project[0].getContent('WEB_title')] #print title - returnList.append((depth,nr,title,project[0])) + if idNr[0]!="x": + returnList.append((depth,nr,title,project[0])) return returnList @@ -652,35 +658,38 @@ class MPIWGRoot(ZSQLExtendFolder): if (element[0]>actualDepth): #fuege soviele ul ein wie unterschied in tiefe if element[0]==1: - ret+="""
""") if len(splitted)>1: tmp=splitted[1].split("
") - self.REQUEST.SESSION['image']=tmp[0].split("\"")[1].encode('utf-8') + #return repr(splitted[1]) + try: + self.imageURL=tmp[0].split("\"")[1].encode('utf-8') + except: + self.imageURL=tmp[0].split("src=")[1].split(" ")[0].encode('utf-8') + split2="".join(tmp[1:]) text3=splitted[0]+split2 @@ -1200,7 +1214,8 @@ class MPIWGProject(CatalogAware,Folder): splitted=text3.split("""""") if len(splitted)>1: tmp=splitted[1].split("
") - self.REQUEST.SESSION['imagecap']=tmp[0].encode('utf-8') + self.imagecap=tmp[0].encode('utf-8') + split4="".join(tmp[1:]) text5=splitted[0]+split4 @@ -1215,14 +1230,21 @@ class MPIWGProject(CatalogAware,Folder): #teste ob WEB_project_description und keine führenden p tags if (len(text5)>4) and (not text5[0:3]=='') and (field=='WEB_project_description'): - return "
"+text5+"
" + text5= ""+text5+"
" #filter image - + return text5.encode('utf-8') - + + def showImagesOfPage(self,imageUrl=None): + """show Images of project""" + self.getContent('WEB_project_description',filter='yes') #get the content and store image infos into session + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','projectImageView.zpt')).__of__(self) + return pt() + + def show_html(self): """simple index""" #return "HI"