Mercurial > hg > MPIWGWeb
changeset 257:7288e7729960 new_pro_struct
added projectType field to MPIWGProjects.
| author | casties |
|---|---|
| date | Wed, 06 Aug 2014 16:41:38 +0200 |
| parents | aea2e316287f |
| children | a416c997b9bc |
| files | HashTree.py MPIWGProjects.py zpt/project/edit_basic.zpt zpt/project/project_index_html.zpt |
| diffstat | 4 files changed, 20 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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
--- 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)</td> </tr> + <tr> + <td>Type of project page:</td> + <td><input name="projectType" tal:attributes="value here/getProjectType" + type="text" len="15" /></td> + </tr> </table> <h2>Names</h2>
--- 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);"> <h2>Subprojects</h2> <div class="row quintuple"> - <div class="col" tal:repeat="project python:projects[:5]"> + <div class="col" tal:repeat="project python:projects[:4]"> <div class="mini project" tal:define="url python:project.getUrl(baseUrl=proBaseUrl)"> <div class="thumb"> <a tal:attributes="href url"><img