add map authors in show page (#1026)

publiclab · Sep 25, 2019 · 72d3350 · 72d3350
1 parent e227387
commit 72d3350
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
@@ -58,6 +58,7 @@ def show
                .where.not(id: @map.id)
                .sample(4)
     @unpaginated = true
+    @users = @map.authors
     render layout: 'application'
   end
 

diff --git a/app/models/map.rb b/app/models/map.rb
@@ -279,4 +279,12 @@ def fetch_map_data
     data = warpables
     data.to_json
   end
+
+  def authors
+    user_ids = []
+    warpables.each do |warp|
+      user_ids.push(warp.versions.map(&:whodunnit))
+    end
+    User.where(id: user_ids.flatten.uniq).where.not(id: user_id)
+  end
 end
diff --git a/app/views/maps/show.html.erb b/app/views/maps/show.html.erb
@@ -29,10 +29,21 @@
 <div class="container-fluid">
     <div class="text-center lead-text">
         <p class="text-muted">A Community Atlas of </p>
-        <h2><%= @map.name %> </h2>
-        <p><%= @map.location %> | by <%= @map.anonymous? ? @map.author : link_to("@#{@map.author}", "/profile/#{@map.author}") %></p>
+        <h2><%= @map.name %>,</h2>
+        <p><%= @map.location %> </p>
+        <p>by <%= @map.anonymous? ? @map.author : link_to("@#{@map.author}", "/profile/#{@map.author}") %>
+    <%= 'with' unless @users.empty? %>
+    <% @users.each_with_index do |author,i| %>
+        <a href="/profile/<%= author.login %>">
+            <%= "@#{author.login}"%></a>
+        <% if i < @users.length-2 %>
+            <%= ',' %>
+        <% elsif i < @users.length-1 %>
+            <%= '&' %>
+        <% end %>
+    <% end %>
+    <br><br>
     </div>
-    <br>
 </div>
 
     <div class="container">