Merge branch 'master' of ssh://161.35.163.87:/home/django/rad

rapids/models.py

@@ -297,7 +297,7 @@ class RapidImage(models.Model):
     rapid = models.ForeignKey(Rapid,
                               related_name="images",
                               on_delete=models.CASCADE)
-    image = models.FileField(upload_to=image_directory_path, storage=image_storage)
+    image = models.FileField(upload_to=image_directory_path)
 
     feedback_image = models.BooleanField(default=False)
 

rapids/templates/rapids/rapid_form.html

@@ -335,7 +335,7 @@
 <a href="{% url 'rapids:rapid_create_defaults' %}">Edit defaults</a>
 <form action="" method="post" enctype="multipart/form-data" id="rapid-form">
     {% csrf_token %}
-    <a href="/generic/abnormality/create" id="add_abnormality" class="add-popup"
+    <a href="/rapids/abnormality/create" id="add_abnormality" class="add-popup"
         onclick="return showAddPopup(this);"><img src="{% static '/img/icon-addlink.svg' %}"></a>
     <a href="/rapids/examination/create" id="add_examination" class="add-popup"
         onclick="return showAddPopup(this);"><img src="{% static '/img/icon-addlink.svg' %}"></a>