From 9e9390cff316251a58606bd89efe85946b354207 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Thu, 9 Jun 2016 10:22:30 +0200
Subject: [PATCH] use new 'view/requestUrl' to avoid '/@@index.html' in URLs

---
 browser/add.pt                    | 2 +-
 browser/contents.pt               | 2 +-
 browser/dataform.pt               | 2 +-
 browser/edit.pt                   | 2 +-
 browser/exportimport.pt           | 4 ++--
 browser/pageform.pt               | 2 +-
 browser/relation_macros.pt        | 6 +++---
 browser/resource_macros.pt        | 4 ++--
 browser/target_macros.pt          | 6 +++---
 external/exportimport.pt          | 4 ++--
 knowledge/glossary/view_macros.pt | 4 ++--
 knowledge/survey/view_macros.pt   | 6 +++---
 media/browser/asset.pt            | 2 +-
 organize/tracking/edit_track.pt   | 2 +-
 14 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/browser/add.pt b/browser/add.pt
index 7649331..ab14bbd 100644
--- a/browser/add.pt
+++ b/browser/add.pt
@@ -5,7 +5,7 @@
 
   <div metal:define-macro="addform">
 
-    <form action="." tal:attributes="action request/URL"
+    <form action="." tal:attributes="action view/requestUrl"
           method="post" enctype="multipart/form-data">
 
       <div metal:define-macro="formbody">
diff --git a/browser/contents.pt b/browser/contents.pt
index 5746ef2..9cab0c9 100644
--- a/browser/contents.pt
+++ b/browser/contents.pt
@@ -15,7 +15,7 @@
     <tal:checkmove define="dummy view/checkMoveAction">
 
     <form name="contents" method="post" action="."
-          tal:attributes="action request/URL"
+          tal:attributes="action view/requestUrl"
           tal:define="container_contents view/listContentInfo">
       <metal:keep-batch define-macro="keep_batch_params">
         <tal:param repeat="param python:('b_page', 'b_size', 'b_overlap', 'b_orphan')">
diff --git a/browser/dataform.pt b/browser/dataform.pt
index bcddfda..df32d86 100644
--- a/browser/dataform.pt
+++ b/browser/dataform.pt
@@ -26,7 +26,7 @@
 <div metal:define-macro="content">
 
 <form action="." metal:define-macro="master"
-      tal:attributes="action request/URL" method="post"
+      tal:attributes="action view/requestUrl" method="post"
       class="edit-form" enctype="multipart/form-data"
       id="zc.page.browser_form">
 
diff --git a/browser/edit.pt b/browser/edit.pt
index de78163..1b569ad 100644
--- a/browser/edit.pt
+++ b/browser/edit.pt
@@ -17,7 +17,7 @@
   <div metal:fill-slot="body">
   <div metal:define-macro="body">
 
-    <form action="." tal:attributes="action request/URL" method="post"
+    <form action="." tal:attributes="action view/requestUrl" method="post"
           enctype="multipart/form-data">
 
       <input type="hidden" name="form_submitted" value="true" />
diff --git a/browser/exportimport.pt b/browser/exportimport.pt
index 4a74cc3..5c57572 100644
--- a/browser/exportimport.pt
+++ b/browser/exportimport.pt
@@ -19,7 +19,7 @@
     </div>
 
     <form action="." method="post"
-          tal:attributes="action string:${request/URL/-1}/export_nodes.html">
+          tal:attributes="action string:${view/requestUrl/-1}/export_nodes.html">
       <input type="hidden" name="loops.action" value="export" />
       <div>&nbsp;</div>
       <h4>Export Nodes</h4>
@@ -32,7 +32,7 @@
     </form>
     
     <form action="." method="post" enctype="multipart/form-data"
-          tal:attributes="action request/URL">
+          tal:attributes="action view/requestUrl">
       <input type="hidden" name="loops.action" value="upload" />
       <div>&nbsp;</div>
       <h4>Import Nodes</h4>
diff --git a/browser/pageform.pt b/browser/pageform.pt
index 7071439..58e38bf 100644
--- a/browser/pageform.pt
+++ b/browser/pageform.pt
@@ -9,7 +9,7 @@
 <div metal:define-macro="form">
 
 <form action="." metal:define-macro="master"
-      tal:attributes="action request/URL" method="post"
+      tal:attributes="action view/requestUrl" method="post"
       class="edit-form" enctype="multipart/form-data"
       id="zc.page.browser_form">
 
diff --git a/browser/relation_macros.pt b/browser/relation_macros.pt
index 55ce0c9..8445133 100644
--- a/browser/relation_macros.pt
+++ b/browser/relation_macros.pt
@@ -18,7 +18,7 @@
     <form metal:define-macro="listing_form"
           method="post" action="."
           tal:define="formName formName|string:listing"
-          tal:attributes="action request/URL;
+          tal:attributes="action view/requestUrl;
                           name formName"
           tal:condition="items">
       <input type="hidden" name="action" value="remove"
@@ -117,7 +117,7 @@
             i18n:translate=""
             style="padding: 0 4px 0 4px">Create Object</legend>
     <form method="post" name="listing" action="."
-        tal:attributes="action request/URL">
+        tal:attributes="action view/requestUrl">
       <input type="hidden" name="action" value="create" />
       <div class="row">
         <span i18n:translate="">Name</span>
@@ -169,7 +169,7 @@
 
 <metal:search define-macro="search">
   <form method="post" name="listing" action="."
-        tal:attributes="action request/URL">
+        tal:attributes="action view/requestUrl">
       <input type="hidden" name="action" value="search" />
       <div class="row"
            tal:define="searchTerm request/searchTerm | nothing;
diff --git a/browser/resource_macros.pt b/browser/resource_macros.pt
index a273dd7..c06c93f 100644
--- a/browser/resource_macros.pt
+++ b/browser/resource_macros.pt
@@ -10,7 +10,7 @@
         <div metal:use-macro="views/node_macros/object_actions" />
       </tal:actions>
       <h1><a tal:omit-tag="python: level > 1"
-             tal:attributes="href request/URL"
+             tal:attributes="href view/requestUrl"
              tal:content="item/title">Title</a></h1>
       <tal:desc define="description description|item/renderedDescription"
                 condition="description">
@@ -51,7 +51,7 @@
   <div tal:attributes="ondblclick python: item.openEditWindow('edit.html')">
     <div metal:use-macro="views/node_macros/object_actions" />
     <h1><a tal:omit-tag="python: level > 1"
-           tal:attributes="href request/URL"
+           tal:attributes="href view/requestUrl"
            tal:content="item/title">Title</a></h1><br />
     <img tal:attributes="src
                 string:${view/url}/.${view/targetId}/view?version=this" />
diff --git a/browser/target_macros.pt b/browser/target_macros.pt
index ced513a..143eacb 100644
--- a/browser/target_macros.pt
+++ b/browser/target_macros.pt
@@ -10,7 +10,7 @@
           method="post" name="listing" action="."
           tal:define="target nocall:view/target"
           tal:condition="python: target or items"
-          tal:attributes="action request/URL">
+          tal:attributes="action view/requestUrl">
       <input type="hidden" name="action" value="assign"
              tal:attributes="value action" />
       <table class="listing" summary="Currently assigned"
@@ -83,7 +83,7 @@
   <fieldset>
     <legend i18n:translate="">Create Target</legend>
     <form method="post" name="listing" action="."
-        tal:attributes="action request/URL">
+        tal:attributes="action view/requestUrl">
       <input type="hidden" name="action" value="create" />
       <div class="row">
         <span i18n:translate="">Name</span>
@@ -114,7 +114,7 @@
 
 <metal:search define-macro="search">
   <form method="post" name="listing" action="."
-        tal:attributes="action request/URL">
+        tal:attributes="action view/requestUrl">
       <input type="hidden" name="action" value="search" />
       <div class="row"
            tal:define="searchTerm request/searchTerm | nothing;
diff --git a/external/exportimport.pt b/external/exportimport.pt
index d739389..2f7c456 100644
--- a/external/exportimport.pt
+++ b/external/exportimport.pt
@@ -19,7 +19,7 @@
     </div>
 
     <form action="." method="post"
-          tal:attributes="action string:${request/URL/-1}/export_loops.html">
+          tal:attributes="action string:${view/requestUrl/-1}/export_loops.html">
       <input type="hidden" name="loops.action" value="export" />
       <div>&nbsp;</div>
       <h4>Export Site</h4>
@@ -93,7 +93,7 @@
     </form>
 
     <form action="." method="post" enctype="multipart/form-data"
-          tal:attributes="action request/URL">
+          tal:attributes="action view/requestUrl">
       <input type="hidden" name="loops.action" value="upload" />
       <div>&nbsp;</div>
       <h4>Import Site</h4>
diff --git a/knowledge/glossary/view_macros.pt b/knowledge/glossary/view_macros.pt
index 88bb440..7ee33d7 100755
--- a/knowledge/glossary/view_macros.pt
+++ b/knowledge/glossary/view_macros.pt
@@ -9,7 +9,7 @@
           class="navlink">
       <a href="#"
          tal:omit-tag="python: letter not in data.keys()"
-         tal:attributes="href string:${request/URL/-1}#$letter"
+         tal:attributes="href string:${view/requestUrl/-1}#$letter"
          tal:content="letter">A</a>
     </span>
   </div>
@@ -17,7 +17,7 @@
   <div tal:repeat="letter data/keys">
     <div class="subtitle"><a name="A" href="#top"
            tal:attributes="name letter;
-                           href string:${request/URL/-1}#top"
+                           href string:${view/requestUrl/-1}#top"
            tal:content="letter">A</a>
     </div>
     <div tal:repeat="related data/?letter|python:[]">
diff --git a/knowledge/survey/view_macros.pt b/knowledge/survey/view_macros.pt
index 94eda84..842a71c 100644
--- a/knowledge/survey/view_macros.pt
+++ b/knowledge/survey/view_macros.pt
@@ -40,7 +40,7 @@
          tal:condition="reports">
       <b i18n:translate="label_survey_show_report">Show Report</b>: &nbsp;
       <a tal:repeat="report reports"
-         tal:attributes="href string:${request/URL}?report=${report/name}"
+         tal:attributes="href string:${view/requestUrl}?report=${report/name}"
          i18n:translate=""
          tal:content="report/label" />
       <br /><br />
@@ -223,7 +223,7 @@
     </p>
     <div class="button" id="show_questionnaire">
       <a i18n:translate=""
-         tal:attributes="href string:${request/URL}${item/urlParamString}">
+         tal:attributes="href string:${view/requestUrl}${item/urlParamString}">
         Back to Questionnaire</a>
       <br />
     </div>
@@ -278,7 +278,7 @@
       </p>
       <div class="button" id="show_questionnaire">
         <a i18n:translate=""
-           tal:attributes="href string:${request/URL}${item/urlParamString}">
+           tal:attributes="href string:${view/requestUrl}${item/urlParamString}">
           Back to Questionnaire</a></div>
     </div>
 </metal:block>
diff --git a/media/browser/asset.pt b/media/browser/asset.pt
index 24f0524..60c7efc 100644
--- a/media/browser/asset.pt
+++ b/media/browser/asset.pt
@@ -3,7 +3,7 @@
     <tal:actions condition="view/showObjectActions">
       <div metal:use-macro="views/node_macros/object_actions" /></tal:actions>
     <h1><a tal:omit-tag="python: level > 1"
-           tal:attributes="href request/URL"
+           tal:attributes="href view/requestUrl"
            tal:content="item/title">Title</a></h1><br />
     <p tal:define="url python: view.getUrlForTarget(item)">
       <a tal:omit-tag="view/isAnonymous"
diff --git a/organize/tracking/edit_track.pt b/organize/tracking/edit_track.pt
index 5ec535e..7e60e57 100644
--- a/organize/tracking/edit_track.pt
+++ b/organize/tracking/edit_track.pt
@@ -4,7 +4,7 @@
 <body>
 
 <div metal:fill-slot="body">
-  <form action="." tal:attributes="action request/URL" method="post">
+  <form action="." tal:attributes="action view/requestUrl" method="post">
     <input type="hidden" name="form_submitted" value="true" />
     <h1>Edit Track <span tal:content="view/id" /></h1>
     <div class="row">