holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #749 from OpenGeoLabs/markdown_fix

Browse Source 
fix markdown bug in resolution text
This commit is contained in:
Garret Wassermann 2019-04-01 15:51:56 -04:00 committed by GitHub
commit 78348590b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
helpdesk/models.py
View File

@ -748,6 +748,10 @@ class Ticket(models.Model):
def get_markdown(self): def get_markdown(self):
return get_markdown(self.description) return get_markdown(self.description)
@property
def get_resolution_markdown(self):
return get_markdown(self.resolution)
class FollowUpManager(models.Manager): class FollowUpManager(models.Manager):

2
helpdesk/templates/helpdesk/ticket_desc_table.html
View File

@ -33,7 +33,7 @@
<th colspan='2'>{% trans "Resolution" %}{% ifequal ticket.get_status_display "Resolved" %} <a href='?close'><button type="button" class="btn btn-warning btn-sm">{% trans "Accept and Close" %}</button></a>{% endifequal %}</th> <th colspan='2'>{% trans "Resolution" %}{% ifequal ticket.get_status_display "Resolved" %} <a href='?close'><button type="button" class="btn btn-warning btn-sm">{% trans "Accept and Close" %}</button></a>{% endifequal %}</th>
</tr> </tr>
<tr> <tr>
<td colspan='2'>{{ ticket.resolution|force_escape|urlizetrunc:50|linebreaksbr }}</td> <td colspan='2'>{{ ticket.get_resolution_markdown|urlizetrunc:50|linebreaksbr }}</td>
</tr>{% endif %} </tr>{% endif %}
<tr> <tr>
<th>{% trans "Due Date" %}</th> <th>{% trans "Due Date" %}</th>

4
helpdesk/views/staff.py
View File

@ -269,7 +269,7 @@ def followup_edit(request, ticket_id, followup_id):
new_followup.user = followup.user new_followup.user = followup.user
new_followup.save() new_followup.save()
# get list of old attachments & link them to new_followup # get list of old attachments & link them to new_followup
attachments = FolllowUpAttachment.objects.filter(followup=followup) attachments = FollowUpAttachment.objects.filter(followup=followup)
for attachment in attachments: for attachment in attachments:
attachment.followup = new_followup attachment.followup = new_followup
attachment.save() attachment.save()
@ -1581,7 +1581,7 @@ def attachment_del(request, ticket_id, attachment_id):
if not _is_my_ticket(request.user, ticket): if not _is_my_ticket(request.user, ticket):
raise PermissionDenied() raise PermissionDenied()
attachment = get_object_or_404(FolllowUpAttachment, id=attachment_id) attachment = get_object_or_404(FollowUpAttachment, id=attachment_id)
if request.method == 'POST': if request.method == 'POST':
attachment.delete() attachment.delete()
return HttpResponseRedirect(reverse('helpdesk:view', args=[ticket_id])) return HttpResponseRedirect(reverse('helpdesk:view', args=[ticket_id]))