mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-02-11 17:19:42 +00:00
Compare commits
2 Commits
16874073e9
...
53b09e47b8
| Author | SHA1 | Date | |
|---|---|---|---|
|
53b09e47b8
|
|||
|
097e7c2481
|
@@ -349,7 +349,7 @@
|
|||||||
{% render_field form.forum_url class+="form-control" %}
|
{% render_field form.forum_url class+="form-control" %}
|
||||||
{% if object.pk %}
|
{% if object.pk %}
|
||||||
<p class="small mb-0">or</p>
|
<p class="small mb-0">or</p>
|
||||||
<a href="{% url 'event_thread' object.pk %}" class="btn btn-primary" title="Create Forum Thread">
|
<a href="{% url 'event_thread' object.pk %}" class="btn btn-primary" title="Create Forum Thread" target="_blank">
|
||||||
<span class="fas fa-plus"></span> <span class="hidden-xs">Create Forum Thread</span></a>
|
<span class="fas fa-plus"></span> <span class="hidden-xs">Create Forum Thread</span></a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -82,7 +82,7 @@
|
|||||||
{% if object.forum_url %}
|
{% if object.forum_url %}
|
||||||
<dd class="col-6"><a href="{{object.forum_url}}">{{object.forum_url}}</a></dd>
|
<dd class="col-6"><a href="{{object.forum_url}}">{{object.forum_url}}</a></dd>
|
||||||
{% else %}
|
{% else %}
|
||||||
<a href="{% url 'event_thread' object.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" target="_blank"><span
|
||||||
class="fas fa-plus"></span> <span
|
class="fas fa-plus"></span> <span
|
||||||
class="hidden-xs">Create Forum Thread</span></a>
|
class="hidden-xs">Create Forum Thread</span></a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import logging
|
||||||
from diff_match_patch import diff_match_patch
|
from diff_match_patch import diff_match_patch
|
||||||
from django.contrib.contenttypes.models import ContentType
|
from django.contrib.contenttypes.models import ContentType
|
||||||
from django.core.exceptions import ObjectDoesNotExist
|
from django.core.exceptions import ObjectDoesNotExist
|
||||||
@@ -160,10 +161,9 @@ class ModelComparison:
|
|||||||
# Build some dicts of what we have
|
# Build some dicts of what we have
|
||||||
item_dict = {} # build a list of items, key is the item_pk
|
item_dict = {} # build a list of items, key is the item_pk
|
||||||
for version in old_item_versions: # put all the old versions in a list
|
for version in old_item_versions: # put all the old versions in a list
|
||||||
old = version._object_version.object
|
if version is None or version._object_version is None:
|
||||||
if old is None:
|
logging.warning(f"Something was null when it really shouldn't be! {old_item_versions}")
|
||||||
pass
|
compare = ModelComparison(old=version._object_version.object, **comparisonParams)
|
||||||
compare = ModelComparison(old=old, **comparisonParams)
|
|
||||||
item_dict[version.object_id] = compare
|
item_dict[version.object_id] = compare
|
||||||
|
|
||||||
for version in new_item_versions: # go through the new versions
|
for version in new_item_versions: # go through the new versions
|
||||||
|
|||||||
Reference in New Issue
Block a user