# HG changeset patch
# User casties
# Date 1370430762 -7200
# Node ID a9ad7dd7a8b2b66e7747e4d149bf239f79ad0d0b
# Parent 9e7bc0958fd895d7b9a5c1e05ebe141ec7249ac7
clean up projects.
diff -r 9e7bc0958fd8 -r a9ad7dd7a8b2 MPIWGProjects.py
--- 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):
diff -r 9e7bc0958fd8 -r a9ad7dd7a8b2 MPIWGStaff.py
--- 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):
diff -r 9e7bc0958fd8 -r a9ad7dd7a8b2 zpt/addMPIWGProjectForm.zpt
--- 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 @@
-
-
- The title
-
-
-
-
-
-
diff -r 9e7bc0958fd8 -r a9ad7dd7a8b2 zpt/project/manage_add_MPIWGProject.zpt
--- /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 @@
+
+
+
+Add a MPIWG Project
+
+
+
+