diff options
| author | Andrew Black <andrewdblack@googlemail.com> | 2013-12-13 19:18:44 +0000 |
|---|---|---|
| committer | Andrew Black <andrewdblack@googlemail.com> | 2013-12-16 12:39:23 +0000 |
| commit | 7485619af0a6fd6785e5763e03e27590ca5f2e14 (patch) | |
| tree | ff535ff05ac55a5d723ff12d954ddd0c35f3f0b2 | |
| parent | c100775c2451c09c1a1559154a5bcd411f399839 (diff) | |
Display annotations on user page.
Parameterise /admin_request/_some_annotations.html.erbi to allow it
to be called from user and request pages
| -rw-r--r-- | app/views/admin_request/_some_annotations.html.erb | 4 | ||||
| -rw-r--r-- | app/views/admin_request/show.html.erb | 3 | ||||
| -rw-r--r-- | app/views/admin_user/show.html.erb | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/app/views/admin_request/_some_annotations.html.erb b/app/views/admin_request/_some_annotations.html.erb index 3ec024fe8..dfd46f828 100644 --- a/app/views/admin_request/_some_annotations.html.erb +++ b/app/views/admin_request/_some_annotations.html.erb @@ -1,6 +1,6 @@ -<% if @info_request.comments.size > 0 %> +<% if comments.size > 0 %> <div class="accordion" id="comments"> - <% for comment in @info_request.comments %> + <% for comment in comments %> <div class="accordion-group"> <div class="accordion-heading"> <a href="#comment_<%=comment.id%>" data-toggle="collapse" data-parent="#comments"><%= chevron_right %></a> diff --git a/app/views/admin_request/show.html.erb b/app/views/admin_request/show.html.erb index bc745bd17..2589e52b4 100644 --- a/app/views/admin_request/show.html.erb +++ b/app/views/admin_request/show.html.erb @@ -325,7 +325,8 @@ <hr> <h2>Annotations</h2> -<%= render :partial => 'admin_request/some_annotations' %> +<%= render :partial => 'admin_request/some_annotations' , :locals => { :comments => @info_request.comments } %> + <hr> <h2>Mail server delivery logs</h2> diff --git a/app/views/admin_user/show.html.erb b/app/views/admin_user/show.html.erb index c93c08e50..6d12aeff5 100644 --- a/app/views/admin_user/show.html.erb +++ b/app/views/admin_user/show.html.erb @@ -91,6 +91,12 @@ <hr> +<h2>Annotations</h2> + +<%= render :partial => 'admin_request/some_annotations' , :locals => { :comments => @admin_user.comments } %> + +<hr> + <h2>Censor rules</h2> <%= render :partial => 'admin_censor_rule/show', :locals => { :censor_rules => @admin_user.censor_rules, :user => @admin_user } %> |