From 40cee5d21218649db81158f1d3adbba32701065a Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Thu, 4 Dec 2008 07:40:24 +0000
Subject: [PATCH] add '?version=this' to src or href URLs for files and media
 assets to make sure that the selected version is displayed

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3030 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 browser/resource_macros.pt | 9 ++++++---
 media/browser/asset.pt     | 5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/browser/resource_macros.pt b/browser/resource_macros.pt
index 5941385..40b69cb 100644
--- a/browser/resource_macros.pt
+++ b/browser/resource_macros.pt
@@ -42,7 +42,8 @@
     <div metal:use-macro="views/node_macros/object_actions" />
     <h3 tal:content="item/title">Title</h3><br />
     <img src="#"
-         tal:attributes="src string:${view/url}/.target${view/targetId}/view" />
+         tal:attributes="src
+                string:${view/url}/.target${view/targetId}/view?version=this" />
     <p><i tal:content="item/description">Description</i></p>
   </div>
 </metal:block>
@@ -57,7 +58,8 @@
       <span class="button">
         <a href="#"
            i18n:translate=""
-           tal:attributes="href string:${view/url}/.target${view/targetId}/download.html">
+           tal:attributes="href
+                string:${view/url}/.target${view/targetId}/download.html?version=this">
           Download
         </a>
       </span>
@@ -65,7 +67,8 @@
             tal:condition="item/viewable | nothing">
         <a href="#"
            i18n:translate=""
-           tal:attributes="href string:${view/url}/.target${view/targetId}/view">
+           tal:attributes="href
+                string:${view/url}/.target${view/targetId}/view?version=this">
           View
         </a>
       </span>
diff --git a/media/browser/asset.pt b/media/browser/asset.pt
index 6cbdaef..58c46f7 100644
--- a/media/browser/asset.pt
+++ b/media/browser/asset.pt
@@ -4,8 +4,9 @@
     <h1 tal:content="item/title">Title</h1><br />
     <p tal:define="url python: view.getUrlForTarget(item)">
       <a href="#"
-         tal:attributes="href string:${url}/view"><img
-            tal:attributes="src string:${url}/@@mediaasset.html?v=medium" /></a>
+         tal:attributes="href string:${url}/view?version=this"><img
+            tal:attributes="src
+                    string:${url}/@@mediaasset.html?version=this&v=medium" /></a>
     </p>
     <p><i tal:content="item/description">Description</i></p>
   </div>