Merge 7cc0148 into b8c4c7e

kiwitcms · May 3, 2019 · 8b2548f · 8b2548f
2 parents b8c4c7e + 7cc0148
commit 8b2548f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/README.rst b/README.rst
@@ -47,6 +47,13 @@ is not currently documented here!
 Changelog
 ---------
 
+v0.1.10 (03 May 2019)
+~~~~~~~~~~~~~~~~~~~~
+
+- Bring back ``tenant_url`` template tag with optional
+  ``schema_name`` parameter
+
+
 v0.1.9 (03 May 2019)
 ~~~~~~~~~~~~~~~~~~~~
 

diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@ def get_install_requires(path):
 
 setup(
     name='kiwitcms-tenants',
-    version='0.1.9',
+    version='0.1.10',
     description='Multi-tenant support for Kiwi TCMS',
     long_description=get_long_description(),
     author='Kiwi TCMS',

diff --git a/tcms_tenants/templatetags/__init__.py b/tcms_tenants/templatetags/__init__.py
diff --git a/tcms_tenants/templatetags/tcms_tenants.py b/tcms_tenants/templatetags/tcms_tenants.py
@@ -0,0 +1,18 @@
+# Copyright (c) 2019 Alexander Todorov <atodorov@MrSenko.com>
+
+# Licensed under the GPL 3.0: https://www.gnu.org/licenses/gpl-3.0.txt
+
+from django import template
+from django.db import connection
+
+from tcms_tenants import utils
+
+register = template.Library()
+
+
+@register.simple_tag
+def tenant_url(request, schema_name = None):
+    if not schema_name:
+        schema_name = connection.schema_name
+
+    return utils.tenant_url(request, schema_name)