--- MPIWGWeb/MPIWGProjects.py 2010/07/23 17:30:38 1.47.2.116 +++ MPIWGWeb/MPIWGProjects.py 2009/02/18 13:01:17 1.48 @@ -125,13 +125,12 @@ class MPIWGProject_image(Image): self.caption=caption[0:] if RESPONSE: + self.redirect(RESPONSE,"../manageImages") class MPIWGProject(CatalogAware,Folder,Cacheable): """Class for Projects""" - - def _p_resolveConflict(self, oldState, savedState, newState): - return newState + security=ClassSecurityInfo() meta_type='MPIWGProject' @@ -517,31 +516,20 @@ class MPIWGProject(CatalogAware,Folder,C def copyObjectToArchive(self): """kopiere aktuelles objekt ins archiv""" - logging.info("copytoarchive 1") cb=self.aq_parent.manage_copyObjects(self.getId()) - logging.info("copytoarchive 2") self.manage_pasteObjects(cb) - logging.info("copytoarchive 3") actualTime=time.localtime() self.manage_renameObject(self.getId(),self.getId()+"_"+time.strftime("%Y%m%d%H%M%S",actualTime)) - logging.info("copytoarchive 4") obj=getattr(self,self.getId()+"_"+time.strftime("%Y%m%d%H%M%S",actualTime)) obj.setArchiveTime(time.strftime("%Y%m%d%H%M%S",actualTime)) - logging.info("copytoarchive 5") ids=[x[0] for x in self.ZopeFind(obj,obj_metatypes=['MPIWGProject'])] - logging.info("copytoarchive 6") obj.manage_delObjects(ids) - logging.info("copytoarchive 7") def setArchiveTime(self,time): """set Archive Time""" self.archiveTime=time[0:] - - def delArchiveTime(self): - """delete archive time""" - del self.archiveTime - + def versionManageForm(self): """version Manage form:currently only set to invisible""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGProject_versionManageForm.zpt')).__of__(self) @@ -683,7 +671,7 @@ class MPIWGProject(CatalogAware,Folder,C return ''; def getStartedAt(self): - """gibt das transformierte Datum zurueck, an dem Projekt begonnen wurde.""" + """gibt das transformierte Datum zurŸck, an dem Projekt begonnen wurde.""" date=getattr(self,'startedAt','') if date: return self.reTransformDate(date); @@ -704,8 +692,8 @@ class MPIWGProject(CatalogAware,Folder,C def transformDate(self,date): - """transformiert ein Datum von DD.MM.YYYY, MM.YYYY,YYYY nach YYYYMMDD, alle nicht angebenen Werte - werden auf 0 gesetzt, es wird null zurueckgegeben falls das Datum ungueltig ist""" + """transformiert ein Datum von DD.MM.YYYY, MM.YYYY,YYYY nach YYYYMMDD, alle nicht angebebenn Werte + werden auf 0 gesetzt, es wird null zurŸckgegeben falls das Datum ungueltig ist""" if (date==None): return None; @@ -828,6 +816,7 @@ class MPIWGProject(CatalogAware,Folder,C security = getSecurityManager() bound_names['user'] = security.getUser() + # Retrieve the value from the cache. keyset = None @@ -847,9 +836,7 @@ class MPIWGProject(CatalogAware,Folder,C security.addContext(self) try: - #logging.debug("index_html pt=%s"%repr(pt)) result = pt.pt_render(extra_context=bound_names) - #logging.debug("index_html result=%s"%repr(result)) if keyset is not None: # Store the result in the cache. self.ZCacheable_set(result, keywords=keyset) @@ -901,7 +888,6 @@ class MPIWGProject(CatalogAware,Folder,C def getContent(self,field,filter=None): """Inhalt des Feldes""" - #logging.debug("getContent field=%s filter=%s"%(field,filter)) if field=="short_title": text = self.getContent("xdata_07") @@ -1011,7 +997,6 @@ class MPIWGProject(CatalogAware,Folder,C def saveEditedContent(self,kupu=None,preview=None): """save Edited content""" - #logging.debug("saveEditedContent kupu=%s preview=%s"%(kupu,preview)) if preview: kupu=preview @@ -1021,6 +1006,7 @@ class MPIWGProject(CatalogAware,Folder,C newcontent= kupu[start+6:end] if preview: + return self.preview(newcontent) self.copyObjectToArchive() @@ -1102,7 +1088,6 @@ class MPIWGProject(CatalogAware,Folder,C def preview(self,description): """preview""" - #logging.debug("preview description=%s"%description) tmpPro=getattr(self,"previewTemplate",None) if not tmpPro: tmpPro=MPIWGProject("previewTemplate") @@ -1111,7 +1096,7 @@ class MPIWGProject(CatalogAware,Folder,C setattr(tmpPro,field,getattr(self,field)) tmpPro.WEB_project_description=description[0:] tmpPro.invisible=True - pt=PageTemplateFile('zpt/previewFrame.zpt',globals()).__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','previewFrame.zpt')).__of__(self) return pt() #return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+"/previewTemplate") @@ -1119,7 +1104,7 @@ class MPIWGProject(CatalogAware,Folder,C def getWebProject_description(self): """get description""" - debug = self.REQUEST.cookies.get("MP_debug_code",None) + debug= self.REQUEST.cookies.get("MP_debug_code",None) if debug and debug=="western": return """ @@ -1127,8 +1112,8 @@ class MPIWGProject(CatalogAware,Folder,C - %s - + %s + """%self.WEB_project_description[0] return """ @@ -1136,8 +1121,8 @@ class MPIWGProject(CatalogAware,Folder,C - %s - + %s + """%self.getContent('WEB_project_description') @@ -1162,7 +1147,7 @@ class MPIWGProject(CatalogAware,Folder,C return False def getPersonKeyList(self): - """gibt die key Liste der beteiligten Personen zurueck (utf8 codiert)""" + """gibt die key Liste der beteiligten Personen zurŸck (utf8 codiert)""" #logging.error("getPersonKeyList:%s"%getattr(self,'responsibleScientistsList',[])) try: return [utf8ify(x[1]) for x in getattr(self,'responsibleScientistsList',[])] @@ -1184,9 +1169,9 @@ class MPIWGProject(CatalogAware,Folder,C else: names=nameList.split(",") - self._v_names=[] - for name in names: - self._v_names.append(name.rstrip().lstrip()) + self._v_names=[] + for name in names: + self._v_names.append(name.rstrip().lstrip()) def sort(x,y):