diff --git a/app/models/user/day_timeline.rb b/app/models/user/day_timeline.rb
index 32aad0814..2a91706d2 100644
--- a/app/models/user/day_timeline.rb
+++ b/app/models/user/day_timeline.rb
@@ -27,7 +27,11 @@ class User::DayTimeline
private
def filtered_events
- @filtered_events ||= Event.where(collection: collections)
+ @filtered_events ||= begin
+ events = Event.where(collection: collections)
+ events = events.where(creator_id: filter.creators.ids) if filter.creators.present?
+ events
+ end
end
def collections
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 254c9d33f..821c00c9a 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -5,7 +5,12 @@
-
<%= Account.sole.name %> / Latest activity
+
+ <%= Account.sole.name %> / Latest activity
+ <% if @filter.creators.any? %>
+ by <%= @filter.creators.each_with_object([]) { |creator, names| names << creator.familiar_name }.to_sentence %>
+ <% end %>
+
<%= render "events/filter", filter: @filter %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index d061814d2..758c3eeec 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -32,8 +32,9 @@
- <%= link_to "See cards assigned to #{ Current.user == @user ? "you" : @user.first_name }", cards_path(assignee_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
- <%= link_to "See cards added by #{ Current.user == @user ? "you" : @user.first_name }", cards_path(creator_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
+ <%= link_to "What #{ Current.user == @user ? "have you" : "#{ @user.first_name } has" } been up to?", events_path(creator_ids: [@user.id]), class: "btn", data: { turbo_frame: "_top" } %>
+ <%= link_to "Which cards are assigned to #{ Current.user == @user ? "you" : @user.first_name }?", cards_path(assignee_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
+ <%= link_to "Which cards were added by #{ Current.user == @user ? "you" : @user.first_name }?", cards_path(creator_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>