Make the active scope for users ensure only non_deleted users are ret…

…urned
openhq · Jul 20, 2015 · 3e00f44 · 3e00f44
1 parent db89dfe
commit 3e00f44
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -25,7 +25,7 @@ class User < ActiveRecord::Base
       case_sensitive: false
     }
 
-  scope :active, -> { where("users.invitation_created_at IS NULL OR users.invitation_accepted_at IS NOT NULL") }
+  scope :active, -> { not_deleted.where("users.invitation_created_at IS NULL OR users.invitation_accepted_at IS NOT NULL") }
   scope :not_deleted, -> { where("deleted_at IS NULL") }
 
   # Overide devise finder to lookup by username or email

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -46,7 +46,7 @@
     App.emojis = <%== MultiJson.dump(Emoji.all.map(&:name)) %>;
     <% end %>
     <% cache User.all_cache_key do %>
-    App.users = <%== MultiJson.dump(ActiveModel::ArraySerializer.new(User.all, each_serializer: PublicUserSerializer, root: false), pretty: true) %>;
+    App.users = <%== MultiJson.dump(ActiveModel::ArraySerializer.new(User.active, each_serializer: PublicUserSerializer, root: false), pretty: true) %>;
     <% end %>
   </script>