From a280d190b6fbc5d310b1c4eb3f4a10f7a1c85161 Mon Sep 17 00:00:00 2001 From: Arnaud-D <35631001+Arnaud-D@users.noreply.github.com> Date: Sat, 14 Oct 2023 10:53:26 +0200 Subject: [PATCH 1/6] =?UTF-8?q?Met=20=C3=A0=20jour=20vers=20Django=204.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 38a729af9a..0cc009dbd2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ beautifulsoup4==4.12.2 django-crispy-forms==2.0 django-model-utils==4.3.1 django-recaptcha==4.0.0 -Django==3.2.23 +Django==4.2.6 easy-thumbnails[svg]==2.8.5 factory-boy==3.3.0 geoip2==4.8.0 From 01ece8baed956ae802a058af89077ecf05601fcc Mon Sep 17 00:00:00 2001 From: Arnaud-D <35631001+Arnaud-D@users.noreply.github.com> Date: Mon, 15 Jan 2024 22:19:58 +0100 Subject: [PATCH 2/6] Modifie FeaturedMessageDelete --- zds/featured/views.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/zds/featured/views.py b/zds/featured/views.py index cf0fddc88b..69bbda8e42 100644 --- a/zds/featured/views.py +++ b/zds/featured/views.py @@ -336,20 +336,16 @@ def form_valid(self, form): class FeaturedMessageDelete(FeaturedViewMixin, DeleteView): - """ - Delete the featured message. - """ - - http_method_names = ["post", "delete"] - last_message = None + """Delete the featured message.""" - def dispatch(self, request, *args, **kwargs): - self.last_message = FeaturedMessage.objects.get_last_message() - return super().dispatch(request, *args, **kwargs) + http_method_names = ["post"] + model = FeaturedMessage - def delete(self, request, *args, **kwargs): - if self.last_message: - self.last_message.delete() + def get_object(self, queryset=None): + return FeaturedMessage.objects.get_last_message() + def form_valid(self, form): + if self.object is not None: + self.object.delete() messages.success(self.request, _("Le message a été supprimé.")) return redirect(reverse("featured:resource-list")) From 81e55cb5359cfff48a6b2d20b32bb87f3a2f0f6b Mon Sep 17 00:00:00 2001 From: Arnaud-D <35631001+Arnaud-D@users.noreply.github.com> Date: Thu, 18 Jan 2024 20:46:20 +0100 Subject: [PATCH 3/6] Modifie DeleteContainerOrExtract --- zds/tutorialv2/views/containers_extracts.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zds/tutorialv2/views/containers_extracts.py b/zds/tutorialv2/views/containers_extracts.py index 7d2493f873..c5661e68cc 100644 --- a/zds/tutorialv2/views/containers_extracts.py +++ b/zds/tutorialv2/views/containers_extracts.py @@ -228,11 +228,11 @@ def form_valid(self, form): class DeleteContainerOrExtract(LoggedWithReadWriteHability, SingleContentViewMixin, DeleteView): model = PublishableContent template_name = None - http_method_names = ["delete", "post"] + http_method_names = ["post"] object = None versioned_object = None - def delete(self, request, *args, **kwargs): + def form_valid(self, form): """delete any object, either Extract or Container""" self.object = self.get_object() self.versioned_object = self.get_versioned_object() From 42129589bb2d0f1f47ff10b1193d3b5bea911e22 Mon Sep 17 00:00:00 2001 From: Arnaud-D <35631001+Arnaud-D@users.noreply.github.com> Date: Thu, 18 Jan 2024 20:46:33 +0100 Subject: [PATCH 4/6] Modifie DeleteContent --- zds/tutorialv2/views/contents.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/zds/tutorialv2/views/contents.py b/zds/tutorialv2/views/contents.py index 018b146899..e01725b672 100644 --- a/zds/tutorialv2/views/contents.py +++ b/zds/tutorialv2/views/contents.py @@ -279,18 +279,14 @@ def form_valid(self, form): class DeleteContent(LoginRequiredMixin, SingleContentViewMixin, DeleteView): model = PublishableContent - template_name = None - http_method_names = ["delete", "post"] - object = None + http_method_names = ["post"] authorized_for_staff = False # deletion is creator's privilege @method_decorator(transaction.atomic) def dispatch(self, *args, **kwargs): return super().dispatch(*args, **kwargs) - def delete(self, request, *args, **kwargs): - """rewrite delete() function to ensure repository deletion""" - + def form_valid(self, form): self.object = self.get_object() object_type = self.object.type.lower() @@ -362,4 +358,4 @@ def delete(self, request, *args, **kwargs): messages.success(self.request, _("Vous avez bien supprimé {}.").format(_type)) - return redirect(reverse(object_type + ":find-" + object_type, args=[request.user.username])) + return redirect(reverse(object_type + ":find-" + object_type, args=[self.request.user.username])) From 4a4baaaaf7b8e0de8c404366860b424d1c0b6b00 Mon Sep 17 00:00:00 2001 From: Arnaud-D <35631001+Arnaud-D@users.noreply.github.com> Date: Thu, 18 Jan 2024 20:46:46 +0100 Subject: [PATCH 5/6] Supprime des imports inutiles --- zds/tutorialv2/views/contents.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/zds/tutorialv2/views/contents.py b/zds/tutorialv2/views/contents.py index e01725b672..33da3f42dc 100644 --- a/zds/tutorialv2/views/contents.py +++ b/zds/tutorialv2/views/contents.py @@ -29,8 +29,6 @@ from zds.tutorialv2.models.database import PublishableContent, Validation from zds.tutorialv2.utils import init_new_repo from zds.tutorialv2.views.authors import RemoveAuthorFromContent -from zds.tutorialv2.views.goals import EditGoalsForm -from zds.tutorialv2.views.labels import EditLabelsForm from zds.utils.models import get_hat_from_settings from zds.mp.utils import send_mp, send_message_mp from zds.utils.uuslug_wrapper import slugify From 7c8e067ec84e0d8e08ef791ff8866ed2c7ac02aa Mon Sep 17 00:00:00 2001 From: Philippe MILINK Date: Sun, 3 Mar 2024 18:27:49 +0100 Subject: [PATCH 6/6] =?UTF-8?q?G=C3=A9n=C3=A8re=20les=20fichiers=20.js.map?= =?UTF-8?q?=20pour=20*tous*=20les=20fichiers=20JS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Requis pour pouvoir exécuter `manage.py collectstatic` --- Gulpfile.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Gulpfile.js b/Gulpfile.js index 4531d699f4..92d1c651df 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -117,7 +117,9 @@ async function jsLint() { console.log(resultText) } -// Get JS minified files from packages +/* Get JS minified files from packages + * Get also sourcemaps for all JS files, required by Django's ManifestStaticFilesStorage since 4.1 (see + * https://docs.djangoproject.com/fr/4.2/ref/contrib/staticfiles/#manifeststaticfilesstorage) */ function jsPackages() { return gulp.src([ require.resolve('jquery/dist/jquery.min.js'), @@ -126,8 +128,8 @@ function jsPackages() { require.resolve('chartjs-adapter-moment/dist/chartjs-adapter-moment.min.js'), require.resolve('chart.js/dist/chart.min.js'), require.resolve('easymde/dist/easymde.min.js') - ]) - .pipe(gulp.dest('dist/js/')) + ], { sourcemaps: true }) + .pipe(gulp.dest('dist/js/', { sourcemaps: '.' })) } // Generates JS for the website