From 04fe515dc82a71bafbea1512cac98fc43a170d96 Mon Sep 17 00:00:00 2001
From: Christophe Benz <christophe.benz@jailbreak.paris>
Date: Fri, 21 Jun 2019 14:27:17 +0200
Subject: [PATCH] Fetch doc URL taking into account doc_url_by_ref

---
 requirements.txt     | 2 +-
 setup.py             | 2 +-
 validata_ui/views.py | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 53aa0f4..66a75a6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ ezodf==0.3.2
 Flask==1.0.2
 Flask-Matomo==1.2.0
 lxml==4.2.5
-opendataschema==0.4.0
+opendataschema==0.4.1
 python-dotenv==0.10.1
 requests==2.22.0
 toml==0.10.0
diff --git a/setup.py b/setup.py
index 084d41c..14e513c 100644
--- a/setup.py
+++ b/setup.py
@@ -64,7 +64,7 @@ setup(
 
         'tabulator',
 
-        'opendataschema >= 0.4.0, < 0.5',
+        'opendataschema >= 0.4.1, < 0.5',
         'validata_core >= 0.3.0, < 0.4',
     ],
 
diff --git a/validata_ui/views.py b/validata_ui/views.py
index 9588ad3..50f1bdb 100644
--- a/validata_ui/views.py
+++ b/validata_ui/views.py
@@ -75,9 +75,8 @@ class SchemaInstance:
                 abort(400, "Schéma '{}' non trouvé dans le catalogue de la section '{}'".format(self.name, self.section_name))
 
             if isinstance(schema_reference, GitSchemaReference):
-                latest_tag = schema_reference.get_latest_tag()
                 if self.ref is None:
-                    schema_ref = latest_tag or schema_reference.get_default_branch()
+                    schema_ref = schema_reference.get_latest_tag() or schema_reference.get_default_branch()
                     abort(redirect(compute_validation_form_url({
                         'schema_name': self.schema_and_section_name,
                         'schema_ref': schema_ref.name
@@ -86,9 +85,8 @@ class SchemaInstance:
                 tag_names = [tag.name for tag in self.tags]
                 self.branches = [branch for branch in schema_reference.iter_branches()
                                  if branch.name not in tag_names]
-                self.doc_url = schema_reference.doc_url \
-                    if self.ref == latest_tag.name \
-                    else schema_reference.get_project_url(self.ref)
+                self.doc_url = schema_reference.get_doc_url(ref=self.ref) or \
+                    schema_reference.get_project_url(ref=self.ref)
 
             self.url = schema_reference.get_schema_url(ref=self.ref)
 
-- 
GitLab