From 50570a44f1e211e91615b07d0ff0a297f2b69d07 Mon Sep 17 00:00:00 2001
From: helmutm
Date: Thu, 14 Jan 2010 12:11:54 +0000
Subject: [PATCH] use '@@' for providing links to views
git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@3684 fd906abe-77d9-0310-91a1-e0d9ade77398
---
wiki/README.txt | 6 +++---
wiki/base/link.py | 2 +-
wiki/generic/mixin.py | 4 +++-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/wiki/README.txt b/wiki/README.txt
index fa12740..2ca684f 100644
--- a/wiki/README.txt
+++ b/wiki/README.txt
@@ -83,7 +83,7 @@ should lead to a view that will create the page.
Back to the Start Page
?More...
+ href="http://127.0.0.1/demo_wiki/@@create.html?name=more">?More...
Again a link object has been created that will be reused for subsequent
rendering operations.
@@ -94,7 +94,7 @@ rendering operations.
>>> print aboutPage.render(TestRequest())
...
?More...
+ href="http://127.0.0.1/demo_wiki/@@create.html?name=more">?More...
>>> len(links)
2
@@ -116,7 +116,7 @@ Links with fragments (anchor references) and parameters
About content
?More content
+ href="http://127.0.0.1/demo_wiki/@@create.html?name=more#content?language=en">?More content
External links
diff --git a/wiki/base/link.py b/wiki/base/link.py
index 569f1b0..eed69ae 100644
--- a/wiki/base/link.py
+++ b/wiki/base/link.py
@@ -72,7 +72,7 @@ class LinkProcessor(object):
if self.request is not None:
if target is None:
#uri = link.refuri = '%s/create.html?name=%s' % (
- uri = '%s/create.html?name=%s' % (
+ uri = '%s/@@create.html?name=%s' % (
absoluteURL(wiki, self.request), link.name)
else:
uri = target.getURI(self.request)
diff --git a/wiki/generic/mixin.py b/wiki/generic/mixin.py
index ed51a61..987a3f2 100644
--- a/wiki/generic/mixin.py
+++ b/wiki/generic/mixin.py
@@ -122,11 +122,12 @@ class Wiki(BaseWiki):
def createPage(self, name, title, text=u''):
# TODO: delegate to generic folder
- # page = self[name] = WikiPage(name)
+ # page = self[name] = self.pageFactory(name)
self._setObject(name, self.pageFactory(name))
page = getattr(self, name)
page.title = title
page.text = text
+ # TODO: notify(ObjectAddedEvent())
return page
def getManager(self):
@@ -144,6 +145,7 @@ class WikiPage(BaseWikiPage):
def getWiki(self):
# TODO: fetch wiki in a generic way
+ # return self.getParent()
return aq_parent(aq_inner(self))