Skip to content

Commit 0b5b5e6

Browse files
committed
Add get_charter_text helper for groups
- Legacy-Id: 3936
1 parent 6a128b0 commit 0b5b5e6

2 files changed

Lines changed: 27 additions & 22 deletions

File tree

ietf/group/proxy.py

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -198,28 +198,8 @@ def chairs(self): # return a set of WGChair objects for this work group
198198
# def drafts(self): # return a set of Rfc objects for this group
199199
# return InternetDraft.objects.filter(group__exact=self.group_acronym)
200200
def charter_text(self): # return string containing WG description read from file
201-
import os
202-
from django.conf import settings
203-
# get file path from settings. Syntesize file name from path, acronym, and suffix
204-
try:
205-
# Try getting charter from new charter tool
206-
charter = Document.objects.get(docalias__name="charter-ietf-%s" % self.acronym)
207-
ch = get_charter_for_revision(charter, charter.rev)
208-
name = ch.name
209-
rev = approved_revision(ch.rev)
210-
filename = os.path.join(charter.get_file_path(), "%s-%s.txt" % (name, rev))
211-
desc_file = open(filename)
212-
desc = desc_file.read()
213-
return desc
214-
except:
215-
try:
216-
filename = os.path.join(settings.IETFWG_DESCRIPTIONS_PATH, self.acronym) + ".desc.txt"
217-
desc_file = open(filename)
218-
desc = desc_file.read()
219-
except BaseException:
220-
desc = 'Error Loading Work Group Description'
221-
return desc
222-
201+
from ietf.group.utils import get_charter_text
202+
return get_charter_text(self)
223203
def additional_urls(self):
224204
return self.groupurl_set.all().order_by("name")
225205
def clean_email_archive(self):

ietf/group/utils.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1+
import os
2+
3+
from django.conf import settings
4+
15
from ietf.group.models import *
26

7+
38
def save_group_in_history(group):
49
def get_model_fields_as_dict(obj):
510
return dict((field.name, getattr(obj, field.name))
@@ -26,3 +31,23 @@ def get_model_fields_as_dict(obj):
2631

2732
return grouphist
2833

34+
def get_charter_text(group):
35+
# get file path from settings. Syntesize file name from path, acronym, and suffix
36+
try:
37+
# Try getting charter from new charter tool
38+
charter = Document.objects.get(docalias__name="charter-ietf-%s" % self.acronym)
39+
ch = get_charter_for_revision(charter, charter.rev)
40+
name = ch.name
41+
rev = approved_revision(ch.rev)
42+
filename = os.path.join(charter.get_file_path(), "%s-%s.txt" % (name, rev))
43+
desc_file = open(filename)
44+
desc = desc_file.read()
45+
return desc
46+
except:
47+
try:
48+
filename = os.path.join(settings.IETFWG_DESCRIPTIONS_PATH, self.acronym) + ".desc.txt"
49+
desc_file = open(filename)
50+
desc = desc_file.read()
51+
except:
52+
desc = 'Error Loading Work Group Description'
53+
return desc

0 commit comments

Comments
 (0)