From 1706cd9da095dd43db70421bcb608a735bb96096 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 4 Dec 2021 18:54:01 +0000
Subject: [PATCH] .

---
 atlas/models.py  | 4 ++--
 longs/models.py  | 8 ++++----
 rapids/models.py | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/atlas/models.py b/atlas/models.py
index d219462e..d1abdd8f 100644
--- a/atlas/models.py
+++ b/atlas/models.py
@@ -338,7 +338,7 @@ class Series(models.Model):
 
     def get_image_urls(self, findings=False):
         images = [
-            "https://www.penracourses.org.uk{}".format(i.image.url)
+            f"{REMOTE_URL}{i.image.url}"
             for i in self.images.all()
         ]
 
@@ -346,7 +346,7 @@ class Series(models.Model):
 
     def get_image_url_array(self, findings=False):
         images = [
-            "https://www.penracourses.org.uk{}".format(i.image.url)
+            f"{REMOTE_URL}{i.image.url}"
             for i in self.images.all()
         ]
 
diff --git a/longs/models.py b/longs/models.py
index 3156a79a..05862f62 100644
--- a/longs/models.py
+++ b/longs/models.py
@@ -172,11 +172,11 @@ class Long(models.Model):
 
     def get_image_urls(self):
         return ",".join(
-            ["https://www.penracourses.org.uk{}".format(i.url) for i in self.get_images()]
+            [f"{REMOTE_URL}{i.url}" for i in self.get_images()]
         )
 
     def get_image_url_array(self):
-        return json.dumps(["https://www.penracourses.org.uk{}".format(i.url) for i in self.get_images()])
+        return json.dumps([f"{REMOTE_URL}{i.url}" for i in self.get_images()])
 
     def get_unmarked_user_answer_count(self, exam_pk=None, marker=None):
         if exam_pk is None:
@@ -442,7 +442,7 @@ class LongSeries(models.Model):
 
     def get_image_urls(self, feedback=False):
         images = [
-            "https://www.penracourses.org.uk{}".format(i.image.url)
+            f"{REMOTE_URL}{i.image.url}"
             for i in self.images.all()
         ]
 
@@ -450,7 +450,7 @@ class LongSeries(models.Model):
 
     def get_image_url_array(self, feedback=False):
         images = [
-            "https://www.penracourses.org.uk{}".format(i.image.url)
+            f"{REMOTE_URL}{i.image.url}"
             for i in self.images.all()
         ]
 
diff --git a/rapids/models.py b/rapids/models.py
index d5147edd..4e83260e 100644
--- a/rapids/models.py
+++ b/rapids/models.py
@@ -1,3 +1,4 @@
+from rad.settings import REMOTE_URL
 from django.db import models
 from django.http.response import JsonResponse
 from django.shortcuts import get_object_or_404
@@ -347,10 +348,10 @@ class Rapid(models.Model):
         return images
 
     def get_image_urls(self):
-        return ",".join(["https://www.penracourses.org.uk{}".format(i.url) for i in self.get_images()])
+        return ",".join([f"{REMOTE_URL}{i.url}" for i in self.get_images()])
 
     def get_image_url_array(self):
-        return json.dumps(["https://www.penracourses.org.uk{}".format(i.url) for i in self.get_images()])
+        return json.dumps([f"{REMOTE_URL}{i.url}" for i in self.get_images()])
     #def GetNonFeedbackQuestionImages(self):
         #return self.get_images()