fix conflict changelog 1.4.0

useblocks · Sep 25, 2023 · 0796b94 · 0796b94
1 parent 789d7e2
commit 0796b94
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 29 deletions.
diff --git a/docs/builders.rst b/docs/builders.rst
@@ -204,32 +204,45 @@ Format
 ++++++
 
 .. code-block:: python
-
-    {
-        "extend_test_001": "directives/needextend",
-        "extend_test_002": "directives/needextend",
-
-        "req_arch_001": "directives/needarch",
-        "req_arch_004": "directives/needarch",
-    
-        "spec_arch_001": "directives/needarch",
-        "test_arch_001": "directives/needarch",
-        "COMP_T_001": "directives/needarch",
-        "COMP_T_002": "directives/needarch",
     
-        "EX_REQ_1": "examples/index",
-        "EX_REQ_2": "examples/index",
-
-        "R_F4722": "examples/index",
-        "OWN_ID_123": "examples/index",
-        "IMPL_01": "examples/index",
-        "T_C3893": "examples/index",
-        "R_2A9D0": "filter",
-        "R_22EB2": "filter",
-        "S_D70B0": "filter",
-        "S_01A67": "filter",
-        "T_5CCAA": "filter",
-        "R_17EB4": "filter",
-        "req_flow_001": "directives/needflow",
-        "spec_flow_001": "directives/needflow",
+    {
+        "created": "2023-09-25T17:11:03.162346",
+        "current_version": "1.3",
+        "project": "Sphinx-Needs",
+        "versions": {
+            "1.3": {
+                "created": "2023-09-25T17:11:03.162329",
+                "filters": {},
+                "filters_amount": 0,
+                "needs": {
+                        "extend_test_001": "directives/needextend",
+                        "extend_test_002": "directives/needextend",
+
+                        "req_arch_001": "directives/needarch",
+                        "req_arch_004": "directives/needarch",
+                    
+                        "spec_arch_001": "directives/needarch",
+                        "test_arch_001": "directives/needarch",
+                        "COMP_T_001": "directives/needarch",
+                        "COMP_T_002": "directives/needarch",
+                    
+                        "EX_REQ_1": "examples/index",
+                        "EX_REQ_2": "examples/index",
+
+                        "R_F4722": "examples/index",
+                        "OWN_ID_123": "examples/index",
+                        "IMPL_01": "examples/index",
+                        "T_C3893": "examples/index",
+                        "R_2A9D0": "filter",
+                        "R_22EB2": "filter",
+                        "S_D70B0": "filter",
+                        "S_01A67": "filter",
+                        "T_5CCAA": "filter",
+                        "R_17EB4": "filter",
+                        "req_flow_001": "directives/needflow",
+                        "spec_flow_001": "directives/needflow",
+                }
+            }
+        }
+        
     }
diff --git a/sphinx_needs/templates/permalink.html b/sphinx_needs/templates/permalink.html
@@ -29,7 +29,7 @@
                 const needs_obj = version['needs'];
 
                 const id = getParameterByName('id');
-                var pathname = new URL(window.location.href).pathname; 
+                var pathname = new URL(window.location.href).pathname;
 
                 pathname = pathname.substring(0, pathname.lastIndexOf('{{ permalink_file }}'));
 
@@ -40,7 +40,14 @@
                 keys.forEach((key, index) => {
                     if (key === id) {
                         const need = needs_obj[key];
-                        docname = need['docname'];
+                        if (typeof need === "object"){
+                            // need.json file
+                            docname = need['docname'];
+                        }
+                        else {
+                            // need_lut file only value is docname or external_link
+                            docname = need
+                        }
                         return;
                     }
                 });