Fix logic when creating events

nottinghamtec · Jun 27, 2023 · 3802029 · 3802029
1 parent c4d0d8e
commit 3802029
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/RIGS/models.py b/RIGS/models.py
@@ -712,7 +712,7 @@ def activity_feed_string(self):
         return f"payment of £{self.amount}"
 
 
-def validate_url(value, requirement):
+def validate_url(value):
     if not value:
         return  # Required error is done the field
     obj = urlparse(value)

diff --git a/RIGS/templates/event_form.html b/RIGS/templates/event_form.html
@@ -347,9 +347,11 @@
                                 <div class="col-sm-12">
                                     <p class="small mb-0">Paste URL</p>
                                     {% render_field form.forum_url class+="form-control" %}
+                                    {% if object.pk %}
                                     <p class="small mb-0">or</p>
-                                    <a href="{% url 'event_thread' event.pk %}" class="btn btn-primary" title="Create Forum Thread">
+                                    <a href="{% url 'event_thread' object.pk %}" class="btn btn-primary" title="Create Forum Thread">
                                     <span class="fas fa-plus"></span> <span class="hidden-xs">Create Forum Thread</span></a>
+                                    {% endif %}
                                 </div>
                             </div>
                         </div>

diff --git a/RIGS/templates/partials/event_details.html b/RIGS/templates/partials/event_details.html
@@ -79,10 +79,10 @@
             {% endif %}
 
             <dt class="col-6">Forum Thread</dt>
-            {% if event.forum_url %}
-            <dd class="col-6"><a href="{{event.forum_url}}">{{event.forum_url}}</a></dd>
+            {% if object.forum_url %}
+            <dd class="col-6"><a href="{{object.forum_url}}">{{object.forum_url}}</a></dd>
             {% else %}
-            <a href="{% url 'event_thread' event.pk %}" class="btn btn-primary" title="Create Forum Thread"><span
+            <a href="{% url 'event_thread' object.pk %}" class="btn btn-primary" title="Create Forum Thread"><span
             class="fas fa-plus"></span> <span
             class="hidden-xs">Create Forum Thread</span></a>
             {% endif %}