# HG changeset patch
# User casties
# Date 1407336098 -7200
# Node ID 7288e7729960013996cb321bcf3ad2e088a49014
# Parent aea2e316287fe7402e7887f12b7711e40aca4ac6
added projectType field to MPIWGProjects.
diff -r aea2e316287f -r 7288e7729960 HashTree.py
--- a/HashTree.py Mon Aug 04 19:39:17 2014 +0200
+++ b/HashTree.py Wed Aug 06 16:41:38 2014 +0200
@@ -211,7 +211,7 @@
"""
keys = self._splitkey(key)
node = self.root
- logging.debug("hashtree.add: keys=%s value=%s"%(repr(keys), repr(value)))
+ #logging.debug("hashtree.add: keys=%s value=%s"%(repr(keys), repr(value)))
for k in keys:
nextnode = node.getNode(k)
if nextnode is None:
diff -r aea2e316287f -r 7288e7729960 MPIWGProjects.py
--- a/MPIWGProjects.py Mon Aug 04 19:39:17 2014 +0200
+++ b/MPIWGProjects.py Wed Aug 06 16:41:38 2014 +0200
@@ -563,6 +563,12 @@
return t
+ def getProjectType(self):
+ """returns the type of project"""
+ t = getattr(self, 'projectType', None)
+ return t
+
+
def getMPIWGProject(self):
"""Return this project for acquisition."""
return self
@@ -1516,6 +1522,12 @@
else:
self.setActiveFlag(False)
+ if formdata.has_key('projectType'):
+ if formdata.get('projectType'):
+ self.projectType = formdata.get('projectType')
+ else:
+ self.projectType = None
+
# make dict of responsible scientists
checkedScientists = {}
names = {}
@@ -1921,7 +1933,7 @@
tree = HashTree(keySeparator='.', keyFn=getInt)
for p in self.objectValues(spec='MPIWGProject'):
# add all projects
- logging.debug("add to project tree: %s, %s"%(repr(p.getNumber()),p))
+ #logging.debug("add to project tree: %s, %s"%(repr(p.getNumber()),p))
tree.add(p.getNumber(), p)
self._v_projectTree = tree
diff -r aea2e316287f -r 7288e7729960 zpt/project/edit_basic.zpt
--- a/zpt/project/edit_basic.zpt Mon Aug 04 19:39:17 2014 +0200
+++ b/zpt/project/edit_basic.zpt Wed Aug 06 16:41:38 2014 +0200
@@ -46,6 +46,11 @@
value python:here.getCompletedAt()"
type="text" len="15" /> (format dd.mm.yyyy or mm.yyyy or yyyy)
+
+ | Type of project page: |
+ |
+
Names
diff -r aea2e316287f -r 7288e7729960 zpt/project/project_index_html.zpt
--- a/zpt/project/project_index_html.zpt Mon Aug 04 19:39:17 2014 +0200
+++ b/zpt/project/project_index_html.zpt Wed Aug 06 16:41:38 2014 +0200
@@ -69,7 +69,7 @@
tal:attributes="class python:test(len(projects)>5, 'ajaxSlider', None);">
Subprojects