altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 5 Packages Projects Releases Wiki Activity

Be more robust in validating group acronyms and display whole form on

Browse source 
creation (reported by Adrian Farrel), too.
 - Legacy-Id: 4313
This commit is contained in:
Ole Laursen 2012-04-24 12:26:29 +00:00
parent 5763c77e54
commit ee5bd75ac6
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ietf/wginfo/edit.py
View file

@ -34,14 +34,8 @@ class WGForm(forms.Form):
def __init__(self, *args, **kwargs):
self.cur_acronym = kwargs.pop('cur_acronym')
self.hide = kwargs.pop('hide', None)
super(self.__class__, self).__init__(*args, **kwargs)
# hide requested fields
if self.hide:
for f in self.hide:
self.fields[f].widget = forms.HiddenInput
# if previous AD is now ex-AD, append that person to the list
ad_pk = self.initial.get('ad')
choices = self.fields['ad'].choices
@ -49,7 +43,10 @@ class WGForm(forms.Form):
self.fields['ad'].choices = list(choices) + [("", "-------"), (ad_pk, Person.objects.get(pk=ad_pk).plain_name())]
def clean_acronym(self):
acronym = self.cleaned_data['acronym']
acronym = self.cleaned_data['acronym'].strip().lower()
if not re.match(r'^[-\w]+$', acronym):
raise forms.ValidationError("Acronym is invalid, may only contain letters, numbers and dashes.")
if self.cur_acronym and acronym != self.cur_acronym:
if Group.objects.filter(acronym__iexact=acronym):
raise forms.ValidationError("Acronym used in an existing WG. Please pick another.")
@ -95,8 +92,8 @@ def edit(request, acronym=None, action="edit"):
# Create WG
wg = Group(name=r["name"],
acronym=r["acronym"],
type=GroupTypeName.objects.get(name="WG"),
state=GroupStateName.objects.get(name="Proposed"))
type=GroupTypeName.objects.get(slug="wg"),
state=GroupStateName.objects.get(slug="proposed"))
wg.save()
e = ChangeStateGroupEvent(group=wg, type="changed_state")
@ -218,12 +215,10 @@ def edit(request, acronym=None, action="edit"):
list_archive=wg.list_archive if wg.list_archive else None,
urls=format_urls(wg.groupurl_set.all()),
)
hide = None
else:
init = dict(ad=login.id if has_role(request.user, "Area Director") else None,
)
hide = ['chairs', 'techadv', 'list_email', 'list_subscribe', 'list_archive', 'urls']
form = WGForm(initial=init, cur_acronym=wg.acronym if wg else None, hide=hide)
form = WGForm(initial=init, cur_acronym=wg.acronym if wg else None)
return render_to_response('wginfo/edit.html',
dict(wg=wg,