--- MPIWGWeb/MPIWGProjects.py 2010/09/14 06:22:50 1.47.2.118 +++ MPIWGWeb/MPIWGProjects.py 2011/05/20 13:49:39 1.47.2.122 @@ -140,6 +140,7 @@ class MPIWGProject_publication(Folder): self._setObject('publicationImage2',nO) + self.ZCacheable_invalidate() if RESPONSE: self.redirect(RESPONSE,"../managePublications") @@ -196,7 +197,7 @@ class MPIWGProject_relatedProject(Folder self.projectWEB_title=object.getContent('WEB_title')[0:] self.enabled=True; - + self.ZCacheable_invalidate() if RESPONSE: self.redirect(RESPONSE,"../manageRelatedProjects") @@ -308,7 +309,7 @@ class MPIWGProject(CatalogAware,Folder,C """test ob es digital sources gibt""" - ret = (self.getContent('xdata_11')=='' and self.getContent('xdata_13')=='') + ret = (self.getContent('xdata_11').lstrip().rstrip()=='') @@ -518,8 +519,11 @@ class MPIWGProject(CatalogAware,Folder,C def addPublication(self,text,RESPONSE=None): """add an MPIWG_Publication""" - - name="publication_"+str(self.getLastPublicationNumber()+1) + number=self.getLastPublicationNumber()+1 + name="publication_"+str(number) + while hasattr(self,name): + number+=1 + name="publication_"+str(number) newPublication=MPIWGProject_publication(name) @@ -529,7 +533,7 @@ class MPIWGProject(CatalogAware,Folder,C obj.enabled=True; obj.place=self.getLastPublicationNumber()+1 obj.id=name - + self.ZCacheable_invalidate() if RESPONSE is not None: self.redirect(RESPONSE,'managePublications') @@ -542,7 +546,13 @@ class MPIWGProject(CatalogAware,Folder,C def addRelatedProject(self,link,RESPONSE=None): """add an MPIWG_Publication""" - name="RelatedProject"+str(self.getLastRelatedProjectNumber()+1) + + + number=self.getLastPublicationNumber()+1 + name="RelatedProject"+str(number) + while hasattr(self,name): + number+=1 + name="RelatedProject_"+str(number) # hole die id des projektes splitted=link.split("/") @@ -570,7 +580,7 @@ class MPIWGProject(CatalogAware,Folder,C obj.enabled=True; obj.place=self.getLastRelatedProjectNumber()+1 obj.id=name - + self.ZCacheable_invalidate() if RESPONSE is not None: self.redirect(RESPONSE,'manageRelatedProjects') @@ -579,7 +589,7 @@ class MPIWGProject(CatalogAware,Folder,C def getLastPublicationNumber(self): publications=self.getPublications() - + if not publications: return 0 else: @@ -596,6 +606,7 @@ class MPIWGProject(CatalogAware,Folder,C def deletePublication(self,id,RESPONSE=None): """delete Publication id""" self.manage_delObjects([id]) + self.ZCacheable_invalidate() if RESPONSE: self.redirect(RESPONSE,'managePublications') @@ -603,6 +614,7 @@ class MPIWGProject(CatalogAware,Folder,C def deleteRelatedProject(self,id,RESPONSE=None): """delete Publication id""" self.manage_delObjects([id]) + self.ZCacheable_invalidate() if RESPONSE: self.redirect(RESPONSE,'manageRelatedProjects') @@ -1655,6 +1667,14 @@ class MPIWGProject(CatalogAware,Folder,C if RESPONSE is not None: RESPONSE.redirect('manage_main') + def tagTheProject(self,RESPONSE=None): + """TAG""" + id=self.getId(); + tmpl =getattr(self.thesaurus,"main.html") + if RESPONSE: + RESPONSE.redirect("./thesaurus/main.html?project="+id) + return + def manage_addMPIWGProjectForm(self): """form for adding the project""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addMPIWGProjectForm.zpt')).__of__(self)