Skip to content

Commit f8f7815

Browse files
committed
Added a slide abstract [Edit] button on slide document pages also for empty abstracts, to provide the ability to add abstracts.
- Legacy-Id: 13825
1 parent fa49287 commit f8f7815

3 files changed

Lines changed: 20 additions & 5 deletions

File tree

ietf/doc/views_material.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ def edit_material(request, name=None, acronym=None, action=None, doc_type=None):
122122

123123
prev_title = doc.title
124124
prev_state = doc.get_state()
125+
prev_abstract = doc.abstract
125126

126127
if "title" in form.cleaned_data:
127128
doc.title = form.cleaned_data["title"]
@@ -158,6 +159,14 @@ def edit_material(request, name=None, acronym=None, action=None, doc_type=None):
158159
e.save()
159160
events.append(e)
160161

162+
if prev_abstract != doc.abstract:
163+
e = DocEvent(doc=doc, rev=doc.rev, by=request.user.person, type='changed_document')
164+
e.desc = u"Changed abstract to <b>%s</b>" % doc.abstract
165+
if prev_abstract:
166+
e.desc += u" from %s" % prev_abstract
167+
e.save()
168+
events.append(e)
169+
161170
if "state" in form.cleaned_data and form.cleaned_data["state"] != prev_state:
162171
doc.set_state(form.cleaned_data["state"])
163172
e = add_state_change_event(doc, request.user.person, prev_state, form.cleaned_data["state"])

ietf/templates/doc/document_material.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<td>{{ doc.title }}</td>
5555
</tr>
5656

57-
{% if doc.abstract %}
57+
{% if doc.abstract or doc.type_id == 'slides' and can_manage_material and not snapshot %}
5858
<tr>
5959
<th>Abstract</th>
6060
<td class="edit">

ietf/templates/meeting/agenda.html

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,17 @@ <h2>
209209
{% endif %}
210210
</td>
211211
<td>
212-
{{item.timeslot.name}}
212+
{% if item.session.agenda %}
213+
<a href="{{ item.session.agenda.href }}">
214+
{{item.timeslot.name}}
215+
</a>
216+
{% else %}
217+
{{item.timeslot.name}}
218+
{% endif %}
213219

214-
{% if item.session.status.slug == 'canceled' %}
215-
<span class="label label-danger pull-right">CANCELLED</span>
216-
{% endif %}
220+
{% if item.session.status.slug == 'canceled' %}
221+
<span class="label label-danger pull-right">CANCELLED</span>
222+
{% endif %}
217223

218224
</td>
219225
<td class="col-md-2">

0 commit comments

Comments
 (0)