Merge branch 'event-address-update-trigger-change' into 'master'

Also send event updates if physical address changed

See merge request framasoft/mobilizon!438
This commit is contained in:
Thomas Citharel
2020-06-05 11:02:46 +02:00
22 changed files with 466 additions and 127 deletions

View File

@@ -17,7 +17,7 @@ defmodule Mobilizon.Web.Email.Event do
alias Mobilizon.Web.{Email, Gettext}
@important_changes [:title, :begins_on, :ends_on, :status]
@important_changes [:title, :begins_on, :ends_on, :status, :physical_address]
@spec event_updated(User.t(), Actor.t(), Event.t(), Event.t(), MapSet.t(), String.t()) ::
Bamboo.Email.t()

View File

@@ -86,6 +86,24 @@
</td>
</tr>
<% end %>
<%= if MapSet.member?(@changes, :physical_address) do %>
<tr>
<td bgcolor="#ffffff" align="left">
<%= gettext "Event address" %>
</td>
<%= unless is_nil(@event.physical_address) do %>
<td bgcolor="#ffffff" align="left">
<p>
<%= Mobilizon.Addresses.Address.representation(@event.physical_address) %>
</p>
</td>
<% else %>
<td bgcolor="#ffffff" align="left">
<%= gettext "Physical address was removed" %>
</td>
<% end %>
</tr>
<% end %>
</table>
</td>
</tr>