[WIP #421] Exclude comments where the user is non-existant

just3ws · just3ws · commit d08b975c3f36 · 2014-11-12T14:39:54.000-06:00
diff --git a/app/controllers/protips_controller.rb b/app/controllers/protips_controller.rb
@@ -2,7 +2,7 @@ class ProtipsController < ApplicationController
 
   before_action :access_required, only: [:new, :create, :edit, :update, :destroy, :me]
   before_action :require_skills_first, only: [:new, :create]
-  before_action :lookup_protip, only: [:show, :edit, :update, :destroy, :upvote, :tag, :flag, :queue, :feature, :delete_tag]
+  before_action :lookup_protip, only: %i(show edit update destroy upvote tag flag queue feature delete_tag)
   before_action :reformat_tags, only: [:create, :update]
   before_action :verify_ownership, only: [:edit, :update, :destroy]
   before_action :ensure_single_tag, only: [:subscribe, :unsubscribe]
@@ -404,8 +404,9 @@ def expand_query(query_string)
   end
 
   def lookup_protip
-    @protip = if public_id = params[:id]
-                Protip.find_by_public_id(public_id.downcase)
+    @protip = if params[:id].present?
+                public_id = params[:id].to_s.strip.downcase
+                Protip.find_by_public_id(public_id)
               else
                 nil
               end
diff --git a/app/views/protips/_protip.html.haml b/app/views/protips/_protip.html.haml
@@ -111,9 +111,9 @@
           %h2.comments-header
             %i.fa.fa-comments
             Comments
-          %ul.comment-list
-            = render protip.comments
-
+          -# HACK: Ignore protip comments where the owner is non-existant
+          -# TODO: Clean out old comments where the is no User associated
+          %ul.comment-list= render protip.comments.select { |comment| comment.user }
         = render 'comments/add_comment'
 
     - if defined?(:job) && !job.nil?
