Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion isiscb/curation/templates/curation/citation_list_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
</td>
<td>
{% if object.created_by_native %}
{{ object.created_by_native__first_name }} {{ object.created_by_native__last_name }}
{{ object.created_by_native|get_user_name }}
{% endif %}
</td>
</tr>
Expand Down
4 changes: 4 additions & 0 deletions isiscb/curation/templatetags/render_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ def render_object(obj):

return SafeText(elem)

@register.filter
def get_user_name(obj):
user = User.objects.get(pk=obj)
return user.username if not user.last_name and not user.first_name else " ".join([user.first_name, user.last_name])

@register.filter(name='get_citation_title')
def get_citation_title(obj):
Expand Down
3 changes: 2 additions & 1 deletion isiscb/isisdata/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,8 @@ def created_by(self):
else:
try:
return self.history.order_by('modified_on')[0].history_user
except:
except Exception as e:
print(e)
return None

created_on_fm = models.DateTimeField(null=True, help_text=help_text("""
Expand Down