Merge branch 'fix_links_in_activity_stream' into 'django3_migration'

Fix links in activity stream

See merge request !385

beat/web/settings/settings.py

@@ -423,7 +423,7 @@ ACTSTREAM_SETTINGS = {
     "MANAGER": "beat.web.common.managers.BeatActionManager",
 }
 
-ABSOLUTE_URL_OVERRIDES = {"auth.user": lambda u: "/events/%s/" % u.username}
+ABSOLUTE_URL_OVERRIDES = {"auth.user": lambda u: f"{URL_PREFIX}/events/{u.username}/"}
 
 SERIALIZATION_MODULES = {"json": "beat.web.utils.activity_stream_serializer"}
 

beat/web/templates/actstream/action.html

@@ -32,9 +32,9 @@
         </td>
         <td style="border-top:0;padding:0;padding-left:0.5em">
           {% if action.actor.get_absolute_url %}
-          <a href="{{ URL_PREFIX }}{{ action.actor.get_absolute_url }}">
+          <a href="{{ action.actor.get_absolute_url }}">
           {% else %}
-          <a href="{{ URL_PREFIX }}{{ action.actor_url }}">
+          <a href="{{ action.actor_url }}">
           {% endif %}
             {{ action.actor.first_name }} ({{ action.actor }})
           </a>