Skip to content

Commit

Permalink
djangocms-alias
Browse files Browse the repository at this point in the history
  • Loading branch information
onny committed Nov 3, 2024
1 parent 5303ebb commit fc11a99
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 0 deletions.
41 changes: 41 additions & 0 deletions pkgs/by-name/fr/froide-govplan/cms-fix.patch
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 pkgs/development/python-modules/djangocms-alias/default.nix
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 ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3306,6 +3306,8 @@ self: super: with self; {

djangocms-admin-style = callPackage ../development/python-modules/djangocms-admin-style { };

djangocms-alias = callPackage ../development/python-modules/djangocms-alias { };

django-admin-datta = callPackage ../development/python-modules/django-admin-datta { };

django-admin-sortable2 = callPackage ../development/python-modules/django-admin-sortable2 { };
Expand Down

0 comments on commit fc11a99

Please sign in to comment.