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

Fixed a bug in the URLs info on wgrecord

Browse source 
- Legacy-Id: 3407
This commit is contained in:
Martin Qvist 2011-09-02 09:26:26 +00:00
parent 6d071d82ab
commit 213dd701bc
2 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/templates/wgrecord/record_history.html
View file

@ -26,10 +26,10 @@ Copyright The IETF Trust 2011, All Rights Reserved
<div id="commentS{{c.comment.id}}">{{ c.info.textSnippet|safe }}</div>
<span class="comment_toggle" onclick="toggleComment({{c.comment.id}})" id="commentT{{c.comment.id}}">[show all]</span>
<div id="commentF{{c.comment.id}}" style="display:none;">
{{ c.info.text|fill:"80"|safe|urlize|linebreaksbr|keep_spacing|sanitize_html|safe }}
{{ c.info.text|fill:"80"|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}
</div>
{% else %}
{{ c.info.text|fill:"80"|safe|urlize|linebreaksbr|keep_spacing|sanitize_html|safe }}
{{ c.info.text|fill:"80"|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}
{% endif %}
</td>
{% endif %}

29
ietf/wgrecord/views_edit.py
View file

@ -208,6 +208,18 @@ class EditInfoForm(forms.Form):
raise forms.ValidationError("Acronym used in a previous WG. Please pick another.")
return acronym
def format_urls(set, fs="\n"):
ostr = ""
for i,x in enumerate(set):
if i != 0:
ostr += fs
if x.name:
ostr += x.url + " (" + x.name + ")"
else:
ostr += x.url
return ostr
@group_required('Area_Director','Secretariat')
def edit_info(request, name=None):
"""Edit or create a WG, notifying parties as
@ -330,16 +342,21 @@ def edit_info(request, name=None):
# update urls
new_urls = get_sorted_string('urls', '\n')
old_urls = [x.url + " (" + x.name + ")" for x in wg.groupurl_set.order_by('url')]
if new_urls != old_urls:
old_urls = format_urls(wg.groupurl_set.order_by('url'), ", ")
if ", ".join(new_urls) != old_urls:
changes.append(desc('urls', ", ".join(new_urls), old_urls))
# Remove old urls
for u in wg.groupurl_set.all():
u.delete()
# Add new ones
for u in [u for u in new_urls if u != ""]:
m = re.search('(?P<url>.+) \((?P<name>.+)\)', u)
url = GroupURL(url=m.group('url'), name=m.group('name'), group=wg)
url.save()
m = re.search('(?P<url>[\w\d:#@%/;$()~_?\+-=\\\.&]+)( \((?P<name>.+)\))?', u)
if m:
if m.group('name'):
url = GroupURL(url=m.group('url'), name=m.group('name'), group=wg)
else:
url = GroupURL(url=m.group('url'), name='', group=wg)
url.save()
wg.time = datetime.now()
@ -367,7 +384,7 @@ def edit_info(request, name=None):
list_email=wg.list_email if wg.list_email else None,
list_subscribe=wg.list_subscribe if wg.list_subscribe else None,
list_archive=wg.list_archive if wg.list_archive else None,
urls=string.join([x.url + " (" + x.name + ")" for x in wg.groupurl_set.all()], "\n"),
urls=format_urls(wg.groupurl_set.all()),
comments=wg.comments if wg.comments else None,
telechat_date=initial_telechat_date,
)