From 1515b6822ffbd7ce26421053f5a90097a35c9aa0 Mon Sep 17 00:00:00 2001 From: albert Date: Fri, 24 Feb 2012 17:18:32 -0500 Subject: [PATCH] fixes #328 --- app/logical/moderator/dashboard/report.rb | 4 ++-- app/views/user_feedbacks/_secondary_links.html.erb | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/logical/moderator/dashboard/report.rb b/app/logical/moderator/dashboard/report.rb index bc4095550..0bdcd265e 100644 --- a/app/logical/moderator/dashboard/report.rb +++ b/app/logical/moderator/dashboard/report.rb @@ -4,8 +4,8 @@ module Moderator attr_reader :min_date, :max_level def initialize(min_date, max_level) - @min_date = min_date - @max_level = max_level + @min_date = min_date.present? ? min_date.to_date : 1.week.ago + @max_level = max_level.present? ? User::Levels::MEMBER : max_level.to_i end def artists diff --git a/app/views/user_feedbacks/_secondary_links.html.erb b/app/views/user_feedbacks/_secondary_links.html.erb index af8cd2af8..39ebdf742 100644 --- a/app/views/user_feedbacks/_secondary_links.html.erb +++ b/app/views/user_feedbacks/_secondary_links.html.erb @@ -2,6 +2,8 @@ <% if @user_feedback %>
  • <%= link_to "New", new_user_feedback_path(:user_feedback => {:user_id => @user_feedback.user_id}) %>
  • + <% elsif params[:search] && params[:search][:user_id_eq] %> +
  • <%= link_to "New", new_user_feedback_path(:user_feedback => {:user_id => params[:search][:user_id_eq]}) %>
  • <% else %>
  • <%= link_to "New", new_user_feedback_path %>
  • <% end %>