From a8f70fd498ad1a72d281e8465c60cfbf23bb2404 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Thu, 9 Jun 2016 09:01:20 +0200
Subject: [PATCH] move new 'view/requestUrl' to cybertools/browser

---
 browser/common.py         | 11 -----------
 browser/concept_macros.pt |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/browser/common.py b/browser/common.py
index 1dfddf5..4b395af 100755
--- a/browser/common.py
+++ b/browser/common.py
@@ -42,7 +42,6 @@ from zope.formlib.namedtemplate import NamedTemplate
 from zope.interface import Interface, implements
 from zope.proxy import removeAllProxies
 from zope.publisher.browser import applySkin
-from zope.publisher.http import URLGetter as BaseURLGetter
 from zope.publisher.interfaces.browser import IBrowserSkinType, IBrowserView
 from zope import schema
 from zope.schema.vocabulary import SimpleTerm
@@ -188,12 +187,6 @@ class SortableMixin(object):
                 return '/@@/cybertools.icons/arrowup.gif'
 
 
-class URLGetter(BaseURLGetter):
-
-    def __str__(self):
-        return self.__request.getURL().rstrip('/@@index.html')
-
-
 class BaseView(GenericView, I18NView, SortableMixin):
 
     actions = {}
@@ -216,10 +209,6 @@ class BaseView(GenericView, I18NView, SortableMixin):
             pass
         saveRequest(request)
 
-    @property
-    def requestUrl(self):
-        return URLGetter(self.request)
-
     def todayFormatted(self):
         return formatDate(date.today(), 'date', 'short',
                           self.languageInfo.language)
diff --git a/browser/concept_macros.pt b/browser/concept_macros.pt
index 7d61dbb..b2d4a4d 100644
--- a/browser/concept_macros.pt
+++ b/browser/concept_macros.pt
@@ -51,7 +51,7 @@
     <h1 tal:define="tabview item/tabview|nothing"
         tal:attributes="ondblclick item/openEditWindow">
       <a tal:omit-tag="python: level > 1"
-         tal:attributes="href string:${request/URL}${item/urlParamString}"
+         tal:attributes="href string:${view/requestUrl}${item/urlParamString}"
          tal:content="item/title">Title</a>
       <a title="Show tabular view"
          i18n:attributes="title"