Correctly display comments

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

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))

View File

@ -70,37 +70,39 @@
{% 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>
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" {% if perms.hrapplications.add_applicationcomment %}
aria-hidden="true"> <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
<div class="modal-dialog"> aria-hidden="true">
<div class="modal-content"> <div class="modal-dialog">
<div class="modal-header"> <div class="modal-content">
<button type="button" class="close" data-dismiss="modal"><span <div class="modal-header">
aria-hidden="true">&times;</span><span class="sr-only">Close</span></button> <button type="button" class="close" data-dismiss="modal"><span
<h4 class="modal-title" id="myModalLabel">Add Comment</h4> aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<h4 class="modal-title" id="myModalLabel">Add Comment</h4>
</div>
<div class="modal-body">
<form class="form-signin" role="form" action="" method="POST">
{% csrf_token %}
{{ comment_form|bootstrap }}
<br/>
<button class="btn btn-lg btn-primary btn-block" type="submit">Add Comment</button>
</form>
</div>
<div class="modal-footer">
</div>
</div> </div>
<div class="modal-body"> </div>
<form class="form-signin" role="form" action="" method="POST"> </div>
{% csrf_token %} {% endif %}
{{ form|bootstrap }}
<br/>
<button class="btn btn-lg btn-primary btn-block" type="submit">Add Comment</button>
</form>
</div>
<div class="modal-footer">
</div>
</div>
</div>
</div>
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>