diff --git a/isiscb/curation/templates/curation/citation_list_view.html b/isiscb/curation/templates/curation/citation_list_view.html index ef1d8f67..9ddba463 100644 --- a/isiscb/curation/templates/curation/citation_list_view.html +++ b/isiscb/curation/templates/curation/citation_list_view.html @@ -233,7 +233,7 @@ {% 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 %} diff --git a/isiscb/curation/templatetags/render_object.py b/isiscb/curation/templatetags/render_object.py index 0eabe6ed..fa478939 100644 --- a/isiscb/curation/templatetags/render_object.py +++ b/isiscb/curation/templatetags/render_object.py @@ -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): diff --git a/isiscb/isisdata/models.py b/isiscb/isisdata/models.py index d3b0f00c..54869d86 100644 --- a/isiscb/isisdata/models.py +++ b/isiscb/isisdata/models.py @@ -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("""