From 5263601212d76dadaf09d38eaec122d784c91d46 Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Mon, 7 Jan 2008 16:48:15 +0000
Subject: [PATCH] added viewName parameter to action, + adjustment of building
 URL

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@2300 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 browser/action.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/browser/action.py b/browser/action.py
index b1ab948..feac08a 100644
--- a/browser/action.py
+++ b/browser/action.py
@@ -37,6 +37,7 @@ class Action(object):
     condition = True
     permission = None
     url = '.'
+    viewName = ''
     targetWindow = ''
     title = ''
     description = ''
@@ -56,14 +57,24 @@ class Action(object):
 
     @Lazy
     def url(self):
-        return self.view.url
+        return self.getActionUrl(self.view.url)
+
+    def getActionUrl(self, baseUrl):
+        if self.viewName:
+            return '/'.join((baseUrl, self.viewName))
+        else:
+            return baseUrl
 
 
 class TargetAction(Action):
 
     @Lazy
     def url(self):
-        return self.view.virtualTargetUrl
+        if self.page is None:
+            baseUrl = self.view.virtualTargetUrl
+        else:
+            baseUrl = self.page.virtualTargetUrl
+        return self.getActionUrl(baseUrl)
 
 
 class DialogAction(Action):