Skip to content

Commit d7f2034

Browse files
Tear out old meeting schedule editor and related code
- Legacy-Id: 19551
1 parent 7b35c09 commit d7f2034

22 files changed

Lines changed: 88 additions & 6161 deletions

ietf/group/models.py

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,12 @@
88
import os
99
import re
1010

11-
from urllib.parse import urljoin
12-
1311
from django.conf import settings
1412
from django.core.validators import RegexValidator
1513
from django.db import models
1614
from django.db.models.deletion import CASCADE, PROTECT
1715
from django.dispatch import receiver
1816

19-
#from simple_history.models import HistoricalRecords
20-
2117
import debug # pyflakes:ignore
2218

2319
from ietf.group.colors import fg_group_colors, bg_group_colors
@@ -168,30 +164,6 @@ def fg_color(self):
168164
def bg_color(self):
169165
return bg_group_colors[self.upcase_acronym]
170166

171-
def json_url(self):
172-
return "/group/%s.json" % (self.acronym,)
173-
174-
def json_dict(self, host_scheme):
175-
group1= dict()
176-
group1['href'] = urljoin(host_scheme, self.json_url())
177-
group1['acronym'] = self.acronym
178-
group1['name'] = self.name
179-
group1['state'] = self.state.slug
180-
group1['type'] = self.type.slug
181-
if self.parent is not None:
182-
group1['parent_href'] = urljoin(host_scheme, self.parent.json_url())
183-
# uncomment when people URL handle is created
184-
try:
185-
if self.ad_role() is not None:
186-
group1['ad_href'] = urljoin(host_scheme, self.ad_role().person.json_url())
187-
except Person.DoesNotExist:
188-
pass
189-
group1['list_email'] = self.list_email
190-
group1['list_subscribe'] = self.list_subscribe
191-
group1['list_archive'] = self.list_archive
192-
group1['comments'] = self.comments
193-
return group1
194-
195167
def has_tools_page(self):
196168
return self.type_id in ['wg', ] and self.state_id in ['active', 'dormant', 'replaced', 'conclude']
197169

ietf/group/urls.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
group_urls = [
5555
url(r'^$', views.active_groups),
5656
url(r'^groupmenu.json', views.group_menu_data, None, 'ietf.group.views.group_menu_data'),
57-
url(r'^%(acronym)s.json$' % settings.URL_REGEXPS, views.group_json),
5857
url(r'^chartering/$', views.chartering_groups),
5958
url(r'^chartering/create/(?P<group_type>(wg|rg))/$', views.edit, {'action': "charter"}),
6059
url(r'^concluded/$', views.concluded_groups),

ietf/group/views.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import datetime
3939
import itertools
4040
import io
41-
import json
4241
import markdown
4342
import math
4443
import os
@@ -1299,13 +1298,6 @@ def stream_edit(request, acronym):
12991298
)
13001299

13011300

1302-
def group_json(request, acronym):
1303-
group = get_object_or_404(Group, acronym=acronym)
1304-
1305-
return HttpResponse(json.dumps(group.json_dict(request.build_absolute_uri('/')),
1306-
sort_keys=True, indent=2),
1307-
content_type="application/json")
1308-
13091301
@cache_control(public=True, max_age=30*60)
13101302
@cache_page(30 * 60)
13111303
def group_menu_data(request):

0 commit comments

Comments
 (0)