use context_host, not default_host, in conversation notifications
Change-Id: I3c1509f41d4a45731a2ed85972c00f63b358f1a2 Reviewed-on: https://gerrit.instructure.com/5203 Tested-by: Hudson <hudson@instructure.com> Reviewed-by: Cody Cutrer <cody@instructure.com>
This commit is contained in:
parent
6be9a8afed
commit
c2c7626915
|
@ -1,5 +1,5 @@
|
|||
<% define_content :link do %>
|
||||
http://<%= HostUrl.default_host %>/conversations/#/conversations/<%= asset.conversation_id %>
|
||||
http://<%= HostUrl.context_host(user) %>/conversations/#/conversations/<%= asset.conversation_id %>
|
||||
<% end %>
|
||||
<% define_content :user_name do %>
|
||||
<%= asset.author.short_name rescue t(:unknown_user, "Unknown User") %>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<% define_content :link do %>
|
||||
http://<%= HostUrl.default_host %>/conversations/#/conversations/<%= asset.conversation_id %>
|
||||
http://<%= HostUrl.context_host(user) %>/conversations/#/conversations/<%= asset.conversation_id %>
|
||||
<% end %>
|
||||
<%= t :body, "%{user_name} just added you to a conversation in Canvas.", :user_name => (asset.author.short_name rescue t(:unknown_user, "Unknown User")) %><br/>
|
||||
<b><a href="<%= content :link %>"><%= t :link_text, "View Conversation" %></a></b>
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
<%= t :body, "%{user_name} just added you to a conversation in Canvas.", :user_name => (asset.author.short_name rescue t(:unknown_user, 'Unknown User')) %>
|
||||
|
||||
<%= t :more_info, "More info at %{url}", :url => HostUrl.default_host %>
|
||||
<%= t :more_info, "More info at %{url}", :url => HostUrl.context_host(user) %>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<% define_content :link do %>
|
||||
http://<%= HostUrl.default_host %>/conversations/#/conversations/<%= asset.conversation_id %>
|
||||
http://<%= HostUrl.context_host(user) %>/conversations/#/conversations/<%= asset.conversation_id %>
|
||||
<% end %>
|
||||
<% define_content :user_name do %>
|
||||
<%= asset.author.short_name rescue t(:unknown_user, "Unknown User") %>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<% define_content :link do %>
|
||||
http://<%= HostUrl.default_host %>/conversations/#/conversations/<%= asset.conversation_id %>
|
||||
http://<%= HostUrl.context_host(user) %>/conversations/#/conversations/<%= asset.conversation_id %>
|
||||
<% end %>
|
||||
<% define_content :user_name do %>
|
||||
<%= asset.author.short_name rescue t(:unknown_user, "Unknown User") %>
|
||||
|
@ -24,7 +24,6 @@
|
|||
<%= t :attached_files, "Attached Files:" %>
|
||||
<% asset.attachments.each do |attachment| %>
|
||||
<%= attachment.display_name %> - <%= attachment.readable_size %>
|
||||
http://<%= HostUrl.default_host %>/files/<%= attachment.id %>
|
||||
|
||||
http://<%= HostUrl.context_host(user) %>/files/<%= attachment.id %>/download?verifier=<%= attachment.uuid %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<% define_content :link do %>
|
||||
http://<%= HostUrl.default_host %>/conversations/#/conversations/<%= asset.conversation_id %>
|
||||
http://<%= HostUrl.context_host(user) %>/conversations/#/conversations/<%= asset.conversation_id %>
|
||||
<% end %>
|
||||
<%= t :body, "%{user_name} just sent you a message in Canvas.", :user_name => (asset.author.short_name rescue t(:unknown_user, "Unknown User")) %><br/>
|
||||
<b><a href="<%= content :link %>"><%= t :link_text, "View Message" %></a></b>
|
||||
|
|
|
@ -2,4 +2,4 @@
|
|||
|
||||
<%= strip_and_truncate(asset.body, :max_length => 50) %>
|
||||
|
||||
<%= t :more_info, "More info at %{url}", :url => HostUrl.default_host %>
|
||||
<%= t :more_info, "More info at %{url}", :url => HostUrl.context_host(user) %>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<% define_content :link do %>
|
||||
http://<%= HostUrl.default_host %>/conversations/#/conversations/<%= asset.conversation_id %>
|
||||
http://<%= HostUrl.context_host(user) %>/conversations/#/conversations/<%= asset.conversation_id %>
|
||||
<% end %>
|
||||
<% define_content :user_name do %>
|
||||
<%= asset.author.short_name rescue t(:unknown_user, "Unknown User") %>
|
||||
|
|
Loading…
Reference in New Issue