fix(django): incorrect context overrides

hitokoto-osc · Oct 5, 2023 · 497984e · 497984e
1 parent f94caa9
commit 497984e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/django/django.go b/django/django.go
@@ -84,7 +84,5 @@ func RenderTemplate(name string, ctx Context) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	mergedCtx := runtimeGlobals()
-	CopyPongoContextRecursive(mergedCtx, ctx)
-	return tpl.Execute(mergedCtx)
+	return tpl.Execute(MergeContext(instance.Globals, runtimeGlobals(), ctx))
 }
diff --git a/django/utils.go b/django/utils.go
@@ -54,3 +54,11 @@ func CopyPongoContextRecursive(dst, src pongo2.Context) {
 		}
 	}
 }
+
+func MergeContext(contexts ...Context) Context {
+	var ctx = make(Context)
+	for _, c := range contexts {
+		CopyPongoContextRecursive(ctx, c)
+	}
+	return ctx
+}