Mercurial > hg > MPIWGWeb
changeset 156:a9ad7dd7a8b2
clean up projects.
| author | casties |
|---|---|
| date | Wed, 05 Jun 2013 13:12:42 +0200 |
| parents | 9e7bc0958fd8 |
| children | 2e0953694aef |
| files | MPIWGProjects.py MPIWGStaff.py zpt/addMPIWGProjectForm.zpt zpt/project/manage_add_MPIWGProject.zpt |
| diffstat | 4 files changed, 23 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/MPIWGProjects.py Mon Jun 03 21:34:25 2013 +0200 +++ b/MPIWGProjects.py Wed Jun 05 13:12:42 2013 +0200 @@ -1831,29 +1831,25 @@ def manage_addMPIWGProjectForm(self): """form for adding the project""" - pt = PageTemplateFile(os.path.join(package_home(globals()), 'zpt', 'addMPIWGProjectForm.zpt')).__of__(self) + pt = PageTemplateFile('zpt/project/manage_add_MPIWGProject', globals()).__of__(self) return pt() -def manage_addMPIWGProject(self, id, RESPONSE=None): +def manage_addMPIWGProject(self, id, fileupload=None, RESPONSE=None): """method to add a project""" - # print argv - fileupload = self.REQUEST.get('fileupload', None) if fileupload: - - file_name = fileupload.filename filedata = fileupload.read() - argv = xmlhelper.proj2hash(filedata) - # print argv newObj = MPIWGProject(id, argv) + else: newObj = MPIWGProject(id) self._setObject(id, newObj) if RESPONSE is not None: - RESPONSE.redirect('manage_main') + url = '%s/%s/editBasic'%(self.absolute_url(), id) + RESPONSE.redirect(url) class MPIWGProjectFolder(ZDBInterfaceFolder):
--- a/MPIWGStaff.py Mon Jun 03 21:34:25 2013 +0200 +++ b/MPIWGStaff.py Wed Jun 05 13:12:42 2013 +0200 @@ -716,13 +716,12 @@ def getPublicationsFromPubman(self,limit=None,publicationType=None): """Return list of publications.""" - if self.content.publications_mode=="year": coneId = self.getConeId(); if coneId: pubs = self.folder.mpiwgPubman.getPublications(coneId,limit=limit,publicationType=publicationType) #pubs= self.folder.getPublicationsFromPubman(coneId,limit=limit,publicationType=publicationType) - return pubs + return pubs elif self.content.publications_mode=="priority": selPubs= self.getSelectedPublications() @@ -734,7 +733,6 @@ break logging.debug("searchFor:%s"%selPub.escidocid) - entry = self.mpiwgPubman.getEntryFromPubman(selPub.escidocid,extendedData=True); #TODO getEntryFromPubmanShould return long texts @@ -742,16 +740,19 @@ 'http://purl.org/eprint/type/BookItem':'book-item', 'http://purl.org/escidoc/metadata/ves/publication-types/article':'article'}; - if publicationType is not None: #publicaitions typ ist gesetzt + if publicationType is not None: + #publicaitions typ ist gesetzt - if not ((entry[1] == publicationType) or (entry[1] == typesLongShort.get(publicationType,''))) : #stimmt nicht dann weiter + if not ((entry[1] == publicationType) or (entry[1] == typesLongShort.get(publicationType,''))) : + #stimmt nicht dann weiter continue; pubs.append((selPub.escidocid,entry[0],entry[2],entry[3],entry[4])); count+=1 return pubs - return {} + + return [] def publications_full_html(self, REQUEST):
--- a/zpt/addMPIWGProjectForm.zpt Mon Jun 03 21:34:25 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -<html> -<head> - <title>The title</title> -</head> -<body> - -<div> - -<h1>Project-Upload</h1> -<form method="post" action="manage_addMPIWGProject" enctype="multipart/form-data"> -<p>ID:</p> -<input name="id"> -<p>File:</p> -<input type="file" name="fileupload"/> -<input type="submit"> -</form> -</div> -</body> -</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/zpt/project/manage_add_MPIWGProject.zpt Wed Jun 05 13:12:42 2013 +0200 @@ -0,0 +1,11 @@ +<tal:block tal:replace="structure here/manage_page_header"/> +<html> +<body> +<h1>Add a MPIWG Project</h1> + +<form method="post" action="manage_addMPIWGProject" enctype="multipart/form-data"> +<p>ID <input size="20" name="id"/></p> +<input type="submit"> +</form> +</body> +</html>