-
-
Notifications
You must be signed in to change notification settings - Fork 14.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
91 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
diff --git a/froide_govplan/templates/admin/froide_govplan/governmentplan/change_form.html b/froide_govplan/templates/admin/froide_govplan/governmentplan/change_form.html | ||
index b512140..33e88cc 100644 | ||
--- a/froide_govplan/templates/admin/froide_govplan/governmentplan/change_form.html | ||
+++ b/froide_govplan/templates/admin/froide_govplan/governmentplan/change_form.html | ||
@@ -9,5 +9,7 @@ | ||
</a> | ||
</li> | ||
{% endif %} | ||
- {{ block.super }} | ||
+ {% if block.super %} | ||
+ {{ block.super }} | ||
+ {% endif %} | ||
{% endblock %} | ||
diff --git a/froide_govplan/templates/froide_govplan/admin/accept_proposal.html b/froide_govplan/templates/froide_govplan/admin/accept_proposal.html | ||
index 24f2b14..98ad5c4 100644 | ||
--- a/froide_govplan/templates/froide_govplan/admin/accept_proposal.html | ||
+++ b/froide_govplan/templates/froide_govplan/admin/accept_proposal.html | ||
@@ -1,7 +1,7 @@ | ||
{% extends "admin/change_form.html" %} | ||
{% load i18n %} | ||
|
||
-{% block title %}{{ object.title }} - {{ block.super }}{% endblock %} | ||
+{% block title %}{{ object.title }} - {% if block.super %}{{ block.super }}{% endif %}{% endblock %} | ||
|
||
|
||
{% block content %}<div id="content-main"> | ||
diff --git a/froide_govplan/templates/froide_govplan/base.html b/froide_govplan/templates/froide_govplan/base.html | ||
index fa9711e..1cd9773 100644 | ||
--- a/froide_govplan/templates/froide_govplan/base.html | ||
+++ b/froide_govplan/templates/froide_govplan/base.html | ||
@@ -3,7 +3,9 @@ | ||
{% load djangocms_alias_tags %} | ||
{% load menu_tags %} | ||
{% block navbar %} | ||
- {{ block.super }} | ||
+ {% if block.super %} | ||
+ {{ block.super }} | ||
+ {% endif %} | ||
{% include "snippets/breadcrumbs.html" with breadcrumbs_background="blue-10" overlay=True %} | ||
{% endblock navbar %} | ||
{% block body %} |
48 changes: 48 additions & 0 deletions
48
pkgs/development/python-modules/djangocms-alias/default.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
{ | ||
lib, | ||
buildPythonPackage, | ||
fetchPypi, | ||
django, | ||
pythonOlder, | ||
pytestCheckHook, | ||
setuptools, | ||
django-parler, | ||
django-cms, | ||
}: | ||
|
||
buildPythonPackage rec { | ||
pname = "djangocms-alias"; | ||
version = "2.0.1"; | ||
pyproject = true; | ||
|
||
disabled = pythonOlder "3.7"; | ||
|
||
src = fetchPypi { | ||
inherit pname version; | ||
hash = "sha256-M3elm8B0+qpPxIqP9xKS9HS73AT/ZPsyWwC38uHvBjE="; | ||
}; | ||
|
||
build-system = [ setuptools ]; | ||
|
||
dependencies = [ | ||
django | ||
django-cms | ||
django-parler | ||
]; | ||
|
||
env.DJANGO_SETTINGS_MODULE = "tests.settings"; | ||
|
||
checkInputs = [ pytestCheckHook ]; | ||
|
||
doCheck = false; | ||
|
||
#pythonImportCheck = [ "django-cms" ]; | ||
|
||
meta = { | ||
description = "Lean enterprise content management powered by Django"; | ||
homepage = "https://django-cms.org"; | ||
changelog = "https://github.com/django-cms/django-cms/releases/tag/${version}"; | ||
license = lib.licenses.bsd3; | ||
maintainers = [ lib.maintainers.onny ]; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters