# HG changeset patch
# User Thierry Florac <thierry.florac@onf.fr>
# Date 1541420410 -3600
# Node ID 1fe028e17f7012758384d279807a4b78a5fea901
# Parent  1359212b00347c90cf188c2d184ffde7feb269db
Updated relative URLs adapters

diff -r 1359212b0034 -r 1fe028e17f70 src/pyams_content/shared/common/skin/url.py
--- a/src/pyams_content/shared/common/skin/url.py	Mon Nov 05 11:18:34 2018 +0100
+++ b/src/pyams_content/shared/common/skin/url.py	Mon Nov 05 13:20:10 2018 +0100
@@ -12,26 +12,32 @@
 
 __docformat__ = 'restructuredtext'
 
-
-# import standard library
-
-# import interfaces
-from pyams_content.shared.common import IWfSharedContent
+from pyams_content.shared.common import ISharedContent, IWfSharedContent
 from pyams_sequence.interfaces import ISequentialIdInfo
 from pyams_skin.layer import IPyAMSUserLayer
+from pyams_utils.adapter import ContextRequestAdapter, adapter_config
 from pyams_utils.interfaces.url import IRelativeURL
+from pyams_utils.url import absolute_url, relative_url
+
 
-# import packages
-from pyams_utils.adapter import adapter_config, ContextRequestAdapter
-from pyams_utils.url import absolute_url
+@adapter_config(context=(ISharedContent, IPyAMSUserLayer), provides=IRelativeURL)
+class SharedContentRelativeURLAdapter(ContextRequestAdapter):
+    """Shared content relative URL adapter"""
+
+    def get_url(self, display_context=None, view_name=None, query=None):
+        version = self.context.published_version
+        if version is not None:
+            return relative_url(version, self.request, display_context, view_name, query)
 
 
 @adapter_config(context=(IWfSharedContent, IPyAMSUserLayer), provides=IRelativeURL)
-class SharedContentRelativeUrlAdapter(ContextRequestAdapter):
-    """Shared content relative URL adapter"""
+class WfSharedContentRelativeUrlAdapter(ContextRequestAdapter):
+    """Workflow managed shared content relative URL adapter"""
 
     def get_url(self, display_context=None, view_name=None, query=None):
         return absolute_url(display_context, self.request,
-                            '++oid++{0}::{1}.html'.format(
+                            '++oid++{0}::{1}{2}{3}'.format(
                                 ISequentialIdInfo(self.context).get_base_oid().strip(),
-                                self.context.content_url))
+                                self.context.content_url,
+                                '/{}'.format(view_name) if view_name else '.html',
+                                '?{}'.format(query) if query else ''))