Skip to content

Commit 3b548d8

Browse files
Removed refrences of Meetings
The tests need to be rewritten to not use Meetings.
1 parent 5407e63 commit 3b548d8

16 files changed

+6
-702
lines changed

djangoproject/templates/base_foundation.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "base.html" %}
2-
{% load fundraising_extras meetings i18n %}
2+
{% load fundraising_extras i18n %}
33

44
{% block og_title %}Django Software Foundation{% endblock %}
55

djangoproject/templates/foundation/meeting_archive.html

Lines changed: 0 additions & 21 deletions
This file was deleted.

djangoproject/templates/foundation/meeting_archive_day.html

Lines changed: 0 additions & 17 deletions
This file was deleted.

djangoproject/templates/foundation/meeting_archive_month.html

Lines changed: 0 additions & 15 deletions
This file was deleted.

djangoproject/templates/foundation/meeting_archive_year.html

Lines changed: 0 additions & 15 deletions
This file was deleted.

djangoproject/templates/foundation/meeting_detail.html

Lines changed: 0 additions & 106 deletions
This file was deleted.

djangoproject/templates/foundation/meeting_snippet.html

Lines changed: 0 additions & 25 deletions
This file was deleted.

djangoproject/urls/www.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
from aggregator.feeds import CommunityAggregatorFeed, CommunityAggregatorFirehoseFeed
1414
from blog.feeds import WeblogEntryFeed
1515
from blog.sitemaps import WeblogSitemap
16-
from foundation.feeds import FoundationMinutesFeed
1716
from foundation.views import CoreDevelopers
1817

1918
admin.autodiscover()
@@ -96,7 +95,6 @@
9695
),
9796
path("contact/", include("contact.urls")),
9897
path("foundation/django_core/", CoreDevelopers.as_view()),
99-
path("foundation/minutes/", include("foundation.urls.meetings")),
10098
path("foundation/", include("members.urls")),
10199
path("fundraising/", include("fundraising.urls")),
102100
# Used by docs search suggestions
@@ -116,11 +114,6 @@
116114
name="aggregator-firehose-feed",
117115
),
118116
path("rss/community/<slug>/", CommunityAggregatorFeed(), name="aggregator-feed"),
119-
path(
120-
"rss/foundation/minutes/",
121-
FoundationMinutesFeed(),
122-
name="foundation-minutes-feed",
123-
),
124117
# django-push
125118
path("subscriber/", include("django_push.subscriber.urls")),
126119
# Trac schtuff

foundation/admin.py

Lines changed: 0 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -4,97 +4,6 @@
44

55
from . import models
66

7-
8-
@admin.register(models.Office)
9-
class OfficeAdmin(admin.ModelAdmin):
10-
pass
11-
12-
13-
@admin.register(models.Term)
14-
class TermAdmin(admin.ModelAdmin):
15-
pass
16-
17-
18-
@admin.register(models.BoardMember)
19-
class BoardMemberAdmin(admin.ModelAdmin):
20-
list_display = ("full_name", "office", "term")
21-
list_filter = ("office", "term")
22-
list_select_related = True
23-
raw_id_fields = ("account",)
24-
25-
@admin.display(ordering="account__last_name")
26-
def full_name(self, obj):
27-
return obj.account.get_full_name()
28-
29-
30-
@admin.register(models.NonBoardAttendee)
31-
class NonBoardAttendeeAdmin(admin.ModelAdmin):
32-
pass
33-
34-
35-
class GrantInline(admin.TabularInline):
36-
model = models.ApprovedGrant
37-
38-
39-
class IndividualMemberInline(admin.TabularInline):
40-
model = models.ApprovedIndividualMember
41-
42-
43-
class CorporateMemberInline(admin.TabularInline):
44-
model = models.ApprovedCorporateMember
45-
46-
47-
class BusinessInline(admin.StackedInline):
48-
model = models.Business
49-
50-
51-
class ActionItemInline(admin.StackedInline):
52-
model = models.ActionItem
53-
54-
55-
@admin.register(models.Meeting)
56-
class MeetingAdmin(admin.ModelAdmin):
57-
fieldsets = (
58-
(
59-
"Metadata",
60-
{
61-
"fields": (
62-
"title",
63-
"slug",
64-
"date",
65-
"leader",
66-
"board_attendees",
67-
"non_board_attendees",
68-
),
69-
},
70-
),
71-
(
72-
"Treasurer report",
73-
{
74-
"fields": ("treasurer_balance", "treasurer_report"),
75-
},
76-
),
77-
)
78-
filter_horizontal = ("board_attendees", "non_board_attendees")
79-
inlines = [
80-
GrantInline,
81-
IndividualMemberInline,
82-
CorporateMemberInline,
83-
BusinessInline,
84-
ActionItemInline,
85-
]
86-
list_display = ("title", "date")
87-
list_filter = ("date",)
88-
prepopulated_fields = {"slug": ("title",)}
89-
90-
def get_changeform_initial_data(self, request):
91-
title = _("DSF Board monthly meeting")
92-
return {
93-
"title": title,
94-
"slug": slugify(title),
95-
}
96-
97-
987
class CoreAwardAdmin(admin.ModelAdmin):
998
list_display = ["recipient", "cohort"]
1009

foundation/feeds.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)