From 0ac8419005ecc85522b742cca9229dd597e65e5d Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 30 Mar 2023 16:29:54 -0400 Subject: [PATCH 1/4] Fixes #12104: Restore copy-to-clipboard & footer navigation in docs --- mkdocs.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index 2317dad6d..57ffaf461 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -8,6 +8,9 @@ theme: custom_dir: docs/_theme/ icon: repo: fontawesome/brands/github + features: + - content.code.copy + - navigation.footer palette: - media: "(prefers-color-scheme: light)" scheme: default @@ -20,7 +23,8 @@ theme: icon: material/lightbulb name: Switch to Light Mode plugins: - - search + - search: + lang: en - mkdocstrings: handlers: python: From 6f08c4a4be9b6780d083fa85057aff97ffd1fd7e Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 30 Mar 2023 16:35:56 -0400 Subject: [PATCH 2/4] Fixes #11846: Update database creation instructions for PostgreSQL 14+ --- docs/installation/1-postgresql.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/1-postgresql.md b/docs/installation/1-postgresql.md index 583a4f3e9..546bfb7b4 100644 --- a/docs/installation/1-postgresql.md +++ b/docs/installation/1-postgresql.md @@ -54,7 +54,7 @@ Within the shell, enter the following commands to create the database and user ( ```postgresql CREATE DATABASE netbox; CREATE USER netbox WITH PASSWORD 'J5brHrAXFLQSif0K'; -GRANT ALL PRIVILEGES ON DATABASE netbox TO netbox; +ALTER DATABASE netbox OWNER TO netbox; ``` !!! danger "Use a strong password" From fbc23424a6689d95b52e9514e95862daddb13863 Mon Sep 17 00:00:00 2001 From: gdprdatasubect <101808236+gdprdatasubect@users.noreply.github.com> Date: Thu, 30 Mar 2023 17:19:55 +0200 Subject: [PATCH 3/4] Update models.py Change default MIME-Type as discussed under #12095 --- netbox/extras/models/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py index bb22c9851..3cab6154d 100644 --- a/netbox/extras/models/models.py +++ b/netbox/extras/models/models.py @@ -301,7 +301,7 @@ class ExportTemplate(CloningMixin, ExportTemplatesMixin, WebhooksMixin, ChangeLo max_length=50, blank=True, verbose_name='MIME type', - help_text=_('Defaults to text/plain') + help_text=_('Defaults to text/plain; charset=utf-8') ) file_extension = models.CharField( max_length=15, @@ -357,7 +357,7 @@ class ExportTemplate(CloningMixin, ExportTemplatesMixin, WebhooksMixin, ChangeLo Render the template to an HTTP response, delivered as a named file attachment """ output = self.render(queryset) - mime_type = 'text/plain' if not self.mime_type else self.mime_type + mime_type = 'text/plain; charset=utf-8' if not self.mime_type else self.mime_type # Build the response response = HttpResponse(output, content_type=mime_type) From 3264636b7a3cec47646abda1e8d9fb5f3dbd6176 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 30 Mar 2023 17:02:23 -0400 Subject: [PATCH 4/4] Changelog for #12084, #12095 --- docs/release-notes/version-3.4.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/release-notes/version-3.4.md b/docs/release-notes/version-3.4.md index 47f590d59..c98e62b81 100644 --- a/docs/release-notes/version-3.4.md +++ b/docs/release-notes/version-3.4.md @@ -2,6 +2,14 @@ ## v3.4.8 (FUTURE) +### Enhancements + +* [#12095](https://github.com/netbox-community/netbox/issues/12095) - Specify UTF-8 encoding for default export template MIME type + +### Bug Fixes + +* [#12084](https://github.com/netbox-community/netbox/issues/12084) - Fix exception when attempting to create a saved filter for applied filters + --- ## v3.4.7 (2023-03-28)