Skip to content

Minor changes #304

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

Merged
mfosterw merged 2 commits into from
Mar 7, 2026
Merged

Minor changes #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa448d6
Add unique created dates to bill fixtures
mfosterw Feb 28, 2026
0c92361
Slightly simplify bill detail view logic
mfosterw Feb 28, 2026
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
168 changes: 82 additions & 86 deletions democrasite/webiscite/fixtures/democrasite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
"modified": "2024-02-25T17:26:54.012Z",
"status": "open",
"draft": false,

"title": "The Initial Act",
"additions": 0,
"deletions": 0,
Expand All @@ -61,7 +60,6 @@
"modified": "2024-02-25T17:26:54.012Z",
"status": "open",
"draft": false,

"title": "The Test Act",
"additions": 1000,
"deletions": 1000,
Expand All @@ -78,7 +76,6 @@
"modified": "2024-02-25T17:26:54.012Z",
"status": "open",
"draft": false,

"title": "The Finished Act",
"additions": 69,
"deletions": 420,
Expand All @@ -87,6 +84,22 @@
"sha": "12345"
}
},
{
"model": "webiscite.pullrequest",
"pk": -4,
"fields": {
"created": "2026-02-16T12:00:00.000Z",
"modified": "2026-02-16T12:00:00.000Z",
"status": "open",
"draft": true,
"title": "The Draft Act",
"additions": 42,
"deletions": 7,
"diff_url": "https://github.com/mfosterw/cookiestocracy/pull/64.diff",
"author_name": "matthew",
"sha": "abc123"
}
},
{
"model": "webiscite.historicalpullrequest",
"pk": 1,
Expand Down Expand Up @@ -150,6 +163,27 @@
"history_user": null
}
},
{
"model": "webiscite.historicalpullrequest",
"pk": 4,
"fields": {
"created": "2026-02-16T12:00:00.000Z",
"modified": "2026-02-16T12:00:00.000Z",
"number": -4,
"title": "The Draft Act",
"additions": 42,
"deletions": 7,
"diff_url": "https://github.com/mfosterw/cookiestocracy/pull/64.diff",
"author_name": "matthew",
"status": "open",
"draft": true,
"sha": "abc123",
"history_date": "2026-02-16T12:00:00.000Z",
"history_change_reason": "",
"history_type": "+",
"history_user": null
}
},
{
"model": "webiscite.bill",
"pk": 1,
Expand All @@ -169,8 +203,8 @@
"model": "webiscite.bill",
"pk": 2,
"fields": {
"created": "2024-02-25T17:26:53.913Z",
"modified": "2024-02-25T17:26:53.950Z",
"created": "2024-02-25T17:30:53.913Z",
"modified": "2024-02-25T17:30:53.950Z",
"name": "The Failed Act",
"description": "This bill failed because not enough people voted on it.",
"author": 1,
Expand All @@ -184,8 +218,8 @@
"model": "webiscite.bill",
"pk": 3,
"fields": {
"created": "2024-02-25T17:26:53.913Z",
"modified": "2024-02-25T17:26:53.950Z",
"created": "2024-02-25T17:40:53.913Z",
"modified": "2024-02-25T17:40:53.950Z",
"name": "The Test Act",
"description": "This is a test. It is the 3rd bill, but the first two are marked as not open, so this should be the oldest bill displayed on the front page.",
"author": 1,
Expand All @@ -199,8 +233,8 @@
"model": "webiscite.bill",
"pk": 4,
"fields": {
"created": "2024-02-25T17:26:53.913Z",
"modified": "2024-02-25T17:26:53.950Z",
"created": "2024-02-25T17:55:53.913Z",
"modified": "2024-02-25T17:55:53.950Z",
"name": "The Rejected Act",
"description": "This bill was rejected by the community. Since it was a constitutional amendment, it required a supermajority to pass.",
"author": 1,
Expand All @@ -214,8 +248,8 @@
"model": "webiscite.bill",
"pk": 5,
"fields": {
"created": "2024-02-25T17:26:53.913Z",
"modified": "2024-02-25T17:26:53.950Z",
"created": "2024-02-25T18:26:53.913Z",
"modified": "2024-02-25T18:26:53.950Z",
"name": "The Constitutional Act",
"description": "This is a constitutional amendment. That should be noted in a subheader beneath the title.",
"author": 1,
Expand All @@ -229,8 +263,8 @@
"model": "webiscite.bill",
"pk": 6,
"fields": {
"created": "2024-02-25T17:26:53.913Z",
"modified": "2024-02-25T17:26:53.950Z",
"created": "2024-02-25T18:36:53.913Z",
"modified": "2024-02-25T18:36:53.950Z",
"name": "The Finished Act",
"description": "This bill was approved and is now part of the live website.",
"author": 1,
Expand All @@ -240,6 +274,21 @@
"_submit_task": 6
}
},
{
"model": "webiscite.bill",
"pk": 7,
"fields": {
"created": "2026-02-16T12:00:00.000Z",
"modified": "2026-02-16T12:00:00.000Z",
"name": "The Draft Act",
"description": "This bill is a draft. It was created from a draft pull request and cannot be voted on until the PR is marked ready for review.",
"author": 1,
"pull_request": -4,
"status": "draft",
"constitutional": false,
"_submit_task": 7
}
},
{
"model": "webiscite.historicalbill",
"pk": 1,
Expand Down Expand Up @@ -360,6 +409,26 @@
"history_user": null
}
},
{
"model": "webiscite.historicalbill",
"pk": 7,
"fields": {
"id": 7,
"created": "2026-02-16T12:00:00.000Z",
"modified": "2026-02-16T12:00:00.000Z",
"name": "The Draft Act",
"description": "This bill is a draft. It was created from a draft pull request and cannot be voted on until the PR is marked ready for review.",
"status": "draft",
"constitutional": false,
"author": 1,
"pull_request": -4,
"_submit_task": 7,
"history_date": "2026-02-16T12:00:00.000Z",
"history_change_reason": "",
"history_type": "+",
"history_user": null
}
},
{
"model": "django_celery_beat.intervalschedule",
"pk": 1,
Expand Down Expand Up @@ -437,79 +506,6 @@
"date_changed": "2024-02-20T12:00:22.856Z"
}
},
{
"model": "webiscite.pullrequest",
"pk": -4,
"fields": {
"created": "2026-02-16T12:00:00.000Z",
"modified": "2026-02-16T12:00:00.000Z",
"status": "open",
"draft": true,

"title": "The Draft Act",
"additions": 42,
"deletions": 7,
"diff_url": "https://github.com/mfosterw/cookiestocracy/pull/64.diff",
"author_name": "matthew",
"sha": "abc123"
}
},
{
"model": "webiscite.historicalpullrequest",
"pk": 4,
"fields": {
"created": "2026-02-16T12:00:00.000Z",
"modified": "2026-02-16T12:00:00.000Z",
"number": -4,
"title": "The Draft Act",
"additions": 42,
"deletions": 7,
"diff_url": "https://github.com/mfosterw/cookiestocracy/pull/64.diff",
"author_name": "matthew",
"status": "open",
"draft": true,
"sha": "abc123",
"history_date": "2026-02-16T12:00:00.000Z",
"history_change_reason": "",
"history_type": "+",
"history_user": null
}
},
{
"model": "webiscite.bill",
"pk": 7,
"fields": {
"created": "2026-02-16T12:00:00.000Z",
"modified": "2026-02-16T12:00:00.000Z",
"name": "The Draft Act",
"description": "This bill is a draft. It was created from a draft pull request and cannot be voted on until the PR is marked ready for review.",
"author": 1,
"pull_request": -4,
"status": "draft",
"constitutional": false,
"_submit_task": 7
}
},
{
"model": "webiscite.historicalbill",
"pk": 7,
"fields": {
"id": 7,
"created": "2026-02-16T12:00:00.000Z",
"modified": "2026-02-16T12:00:00.000Z",
"name": "The Draft Act",
"description": "This bill is a draft. It was created from a draft pull request and cannot be voted on until the PR is marked ready for review.",
"status": "draft",
"constitutional": false,
"author": 1,
"pull_request": -4,
"_submit_task": 7,
"history_date": "2026-02-16T12:00:00.000Z",
"history_change_reason": "",
"history_type": "+",
"history_user": null
}
},
{
"model": "django_celery_beat.periodictask",
"pk": 7,
Expand Down
14 changes: 6 additions & 8 deletions democrasite/webiscite/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.auth.mixins import UserPassesTestMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.http import Http404
from django.shortcuts import get_object_or_404
from django.utils.translation import gettext_lazy as _
from django.views.decorators.http import require_POST
from django.views.generic import DetailView
Expand Down Expand Up @@ -96,13 +96,11 @@ class BillDetailView(DetailView):
def get_object(self, queryset=None):
pk = self.kwargs.get("pk")

try:
if self.request.user.is_authenticated:
return Bill.objects.annotate_user_vote(self.request.user).get(pk=pk)
return Bill.objects.get(pk=pk)

except Bill.DoesNotExist as err:
raise Http404(_("No Bills found matching query")) from err
if self.request.user.is_authenticated:
return get_object_or_404(
Bill.objects.annotate_user_vote(self.request.user), pk=pk
)
return get_object_or_404(Bill)


bill_detail_view = BillDetailView.as_view()
Expand Down
⚡