# HG changeset patch
# User casties
# Date 1435232630 -7200
# Node ID 37b89e8a8828fb1f988627fca03c44a5cc58d781
# Parent d83971b49b2623a1e99d19e35c71a0daa3ca41c9# Parent a1edd65c8ab723eef5157c1ed333c7ee575289dc
merging...
diff -r d83971b49b26 -r 37b89e8a8828 MPIWGFeature.py
--- a/MPIWGFeature.py Thu May 21 09:22:11 2015 +0200
+++ b/MPIWGFeature.py Thu Jun 25 13:43:50 2015 +0200
@@ -29,6 +29,7 @@
changeWeightForm = PageTemplateFile('zpt/feature/manage_change_weight', globals())
changeForm = PageTemplateFile('zpt/feature/manage_config', globals())
feature_main = PageTemplateFile('zpt/feature/feature_template', globals())
+ index_xml = PageTemplateFile('zpt/feature/feature_index_xml', globals())
def __init__(self, id, title=None, weight=0, date=None, title_en=None, title_de=None, author=None, author_id=None):
self.id = str(id)
diff -r d83971b49b26 -r 37b89e8a8828 MPIWGProjects.py
--- a/MPIWGProjects.py Thu May 21 09:22:11 2015 +0200
+++ b/MPIWGProjects.py Thu Jun 25 13:43:50 2015 +0200
@@ -380,6 +380,7 @@
# templates
#
project_html = PageTemplateFile('zpt/project/project_index_html', globals())
+ project_xml = PageTemplateFile('zpt/project/project_index_xml', globals())
# edit templates
edit_css = ImageFile('css/edit.css', globals())
# make css refreshable for development
@@ -443,6 +444,13 @@
# render template
return pt()
+ def index_xml(self):
+ """default xml representation"""
+ # get template
+ pt = self.project_xml
+ # render template
+ return pt()
+
redirect = MPIWGHelper.redirect
@@ -1928,6 +1936,8 @@
meta_type = "MPIWGProjectFolder"
security = ClassSecurityInfo()
+ allprojects_xml = PageTemplateFile('zpt/project/all_projects_xml', globals())
+
# cached HashTree with project hierarchy
_v_projectTree = None
@@ -1949,6 +1959,14 @@
return tree
+ def index_xml(self):
+ """default xml representation"""
+ # get template
+ pt = self.allprojects_xml
+ # render template
+ return pt()
+
+
def getProjectsAsList(self, start=None, active=1, archived=1, depthFirst=True, filter=None):
"""Return flattened list of projects, starting from start.
diff -r d83971b49b26 -r 37b89e8a8828 MPIWGStaff.py
diff -r d83971b49b26 -r 37b89e8a8828 zpt/feature/feature_index_xml.zpt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/zpt/feature/feature_index_xml.zpt Thu Jun 25 13:43:50 2015 +0200
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r d83971b49b26 -r 37b89e8a8828 zpt/project/all_projects_xml.zpt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/zpt/project/all_projects_xml.zpt Thu Jun 25 13:43:50 2015 +0200
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff -r d83971b49b26 -r 37b89e8a8828 zpt/project/project_index_xml.zpt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/zpt/project/project_index_xml.zpt Thu Jun 25 13:43:50 2015 +0200
@@ -0,0 +1,52 @@
+
+
+
+ History of Scientific Objectivity, 18th-19th Cs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Project description
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file