Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-16 16:00:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correctly display comments

Browse Source 
still unable to make comment form render
This commit is contained in:
Adarnof 2016-03-13 21:59:54 +00:00
parent 477e579eba
commit ed11884a0b
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hrapplications/views.py
View File

@ -83,7 +83,7 @@ def hr_application_personal_view(request, app_id):
'responses': ApplicationResponse.objects.filter(application=app), 'responses': ApplicationResponse.objects.filter(application=app),
'buttons': False, 'buttons': False,
'comments': ApplicationComment.objects.filter(application=app), 'comments': ApplicationComment.objects.filter(application=app),
'form': None, 'comment_form': None,
'apis': [], 'apis': [],
} }
return render_to_response('registered/hrapplicationview.html', context, context_instance=RequestContext(request)) return render_to_response('registered/hrapplicationview.html', context, context_instance=RequestContext(request))
@ -133,7 +133,7 @@ def hr_application_view(request, app_id):
'buttons': True, 'buttons': True,
'apis': app.apis, 'apis': app.apis,
'comments': ApplicationComment.objects.filter(application=app), 'comments': ApplicationComment.objects.filter(application=app),
'form': form, 'comment_form': form,
} }
return render_to_response('registered/hrapplicationview.html', context, context_instance=RequestContext(request)) return render_to_response('registered/hrapplicationview.html', context, context_instance=RequestContext(request))

8
stock/templates/registered/hrapplicationview.html
View File

@ -70,15 +70,16 @@
{% for comment in comments %} {% for comment in comments %}
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" role="tab" id=""> <div class="panel-heading" role="tab" id="">
<div class="panel-title">{{comment.created_on}} - {{ comment.user }}</div> <div class="panel-title">{{comment.created}} - {{ comment.user }}</div>
</div> </div>
<div class="panel-body">{{ comment.comment }}</div> <div class="panel-body">{{ comment.text }}</div>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% if perms.hrapplications.add_applicationcomment %}
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
aria-hidden="true"> aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
@ -91,7 +92,7 @@
<div class="modal-body"> <div class="modal-body">
<form class="form-signin" role="form" action="" method="POST"> <form class="form-signin" role="form" action="" method="POST">
{% csrf_token %} {% csrf_token %}
{{ form|bootstrap }} {{ comment_form|bootstrap }}
<br/> <br/>
<button class="btn btn-lg btn-primary btn-block" type="submit">Add Comment</button> <button class="btn btn-lg btn-primary btn-block" type="submit">Add Comment</button>
</form> </form>
@ -103,6 +104,7 @@
</div> </div>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endif %}
</div> </div>
</div> </div>
</div> </div>