From ad6ad8074e28ae7139183579c463a429944c5dc4 Mon Sep 17 00:00:00 2001 From: albert Date: Tue, 19 Feb 2013 14:10:13 -0500 Subject: [PATCH] fixes #396 --- app/assets/stylesheets/specific/user_feedback.css.scss | 9 +++++++++ app/models/user_feedback.rb | 10 +++++----- app/views/user_feedbacks/index.html.erb | 6 +++--- 3 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 app/assets/stylesheets/specific/user_feedback.css.scss diff --git a/app/assets/stylesheets/specific/user_feedback.css.scss b/app/assets/stylesheets/specific/user_feedback.css.scss new file mode 100644 index 000000000..5e2582b83 --- /dev/null +++ b/app/assets/stylesheets/specific/user_feedback.css.scss @@ -0,0 +1,9 @@ +div#c-user-feedbacks { + tr.feedback-category-positive { + background: #DDFFDD !important; + } + + tr.feedback-category-negative { + background: #FFDDDD !important; + } +} \ No newline at end of file diff --git a/app/models/user_feedback.rb b/app/models/user_feedback.rb index 7fabcd5fa..f393ad5f7 100644 --- a/app/models/user_feedback.rb +++ b/app/models/user_feedback.rb @@ -55,11 +55,11 @@ class UserFeedback < ActiveRecord::Base end def user_name - if user - user.name - else - nil - end + User.id_to_name(user_id) + end + + def creator_name + User.id_to_name(creator_id) end def user_name=(name) diff --git a/app/views/user_feedbacks/index.html.erb b/app/views/user_feedbacks/index.html.erb index 397053538..891294b17 100644 --- a/app/views/user_feedbacks/index.html.erb +++ b/app/views/user_feedbacks/index.html.erb @@ -14,10 +14,10 @@ <% @user_feedbacks.each do |feedback| %> - + <%= feedback.category %> - <%= link_to feedback.user_name, user_feedback_path(feedback.user_id) %> - <%= feedback.creator.name %> + <%= link_to feedback.user_name, user_path(feedback.user_id) %> + <%= link_to feedback.creator_name, user_path(feedback.creator_id) %> <%= time_ago_in_words_tagged(feedback.created_at) %> ago <%= format_text(feedback.body) %>