Skip to content

Commit 7e60f91

Browse files
committed
rework filters to avoid conflict in editing vs showing all
- Legacy-Id: 8436
1 parent 31f687b commit 7e60f91

2 files changed

Lines changed: 18 additions & 2 deletions

File tree

ietf/doc/templatetags/ietf_filters.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,19 @@ def format_snippet(text):
458458
return mark_safe(u'<div class="snippet">%s<span class="show-all">[show all]</span></div><div style="display:none" class="full">%s</div>' % (snippet, full))
459459
return full
460460

461+
@register.filter
462+
def format_editable_snippet(text,link):
463+
full = mark_safe(keep_spacing(linebreaksbr(urlize(sanitize_html(text)))))
464+
snippet = truncatewords_html(full, 25)
465+
if snippet != full:
466+
return mark_safe(u'<div class="snippet">%s<span class="show-all">[show all]</span></div><div style="display:none" class="full">%s' % (format_editable(snippet,link),format_editable(full,link)) )
467+
else:
468+
return format_editable(full,link)
469+
470+
@register.filter
471+
def format_editable(text,link):
472+
return mark_safe(u'<a class="editlink" href="%s">%s</a>' % (link,text))
473+
461474
@register.filter
462475
def textify(text):
463476
text = re.sub("</?b>", "*", text)

ietf/templates/doc/document_material.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@
3030
<tr>
3131
<td>Abstract:</td>
3232
<td>
33-
<a {% if not snapshot and can_manage_material %} class="editlink" href="{% url "material_edit" name=doc.name action="abstract" name=doc.name %}"{% endif %}>
33+
{% if not snapshot and can_manage_material %}
34+
{% url "material_edit" name=doc.name action="abstract" as editurl %}
35+
{{ doc.abstract | format_editable_snippet:editurl }}
36+
{% else %}
3437
{{ doc.abstract | format_snippet }}
35-
</a>
38+
{% endif %}
3639
</td>
3740
</tr>
3841
{% endif %}

0 commit comments

Comments
 (0)