Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix preview #489

Merged
merged 4 commits into from
Oct 30, 2023
Merged

Fix preview #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
040ad6b
use self, not self.contentpage
CamLamb Oct 26, 2023
bffc91e
Use the current HEAD of the github repo master branch
CamLamb Oct 26, 2023
7ba4683
Update to use our uktrade fork
CamLamb Oct 30, 2023
0101304
Add comment
CamLamb Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ django-crispy-forms = "^1.14.0"
django-environ = "^0.10.0"
# django_redis = "^5.2.0"
django-settings-export = "^1.2.1"
django-simple-history = "^3.3.0"
# TODO: Set django-simple-history to the next release after 3.4.0 (when released)
django-simple-history = { git = "https://github.com/uktrade/django-simple-history.git", rev = "29108a5" }
django-storages = "^1.13.2"
django-webpack-loader = "^1.8.1"
djangorestframework = "^3.14.0"
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ django-log-formatter-ecs==0.0.5 ; python_version >= "3.11" and python_version <
django-modelcluster==6.1 ; python_version >= "3.11" and python_version < "4.0"
django-permissionedforms==0.1 ; python_version >= "3.11" and python_version < "4.0"
django-settings-export==1.2.1 ; python_version >= "3.11" and python_version < "4.0"
django-simple-history==3.4.0 ; python_version >= "3.11" and python_version < "4.0"
django-simple-history @ git+https://github.com/uktrade/django-simple-history.git@29108a5 ; python_version >= "3.11" and python_version < "4.0"
django-staff-sso-client==4.2.1 ; python_version >= "3.11" and python_version < "4.0"
django-storages==1.14.2 ; python_version >= "3.11" and python_version < "4.0"
django-taggit==3.1.0 ; python_version >= "3.11" and python_version < "4.0"
Expand Down
8 changes: 4 additions & 4 deletions src/working_at_dit/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,28 +36,28 @@ def get_context(self, request, *args, **kwargs):
context = super().get_context(request, *args, **kwargs)

context["related_news"] = PageTopic.objects.filter(
topic=self.contentpage, page__content_type__app_label="news"
topic=self, page__content_type__app_label="news"
).order_by("-page__last_published_at")[:5]

context["policies_and_guidance"] = (
ContentPage.objects.public()
.live()
.filter(
topics__topic=self.contentpage,
topics__topic=self,
content_type__app_label="working_at_dit",
)
.filter(Q(content_type__model="policy") | Q(content_type__model="guidance"))
.order_by("-last_published_at")
)

tools = PageTopic.objects.filter(
topic=self.contentpage, page__content_type__app_label="tools"
topic=self, page__content_type__app_label="tools"
).order_by("page__last_published_at")

context["tools"] = tools

how_do_is = PageTopic.objects.filter(
topic=self.contentpage,
topic=self,
page__content_type__app_label="working_at_dit",
page__content_type__model="howdoi",
page__live=True,
Expand Down