Merge branch '153-add-last-name-file-hash-in-dataset-form-dropdown' into 'master'

Resolve "add last name + file hash in dataset form dropdown"

Closes #153

See merge request !81

portal/models.py

@@ -173,7 +173,7 @@ class DataFile(models.Model):
     objects = DataFileManager()
 
     def __str__(self):
-        return self.filename
+        return f"{self.filename} ({self.iric_data_id})"
 
     @property
     def filext(self):

portal/templates/portal/secure/base.html

@@ -9,7 +9,7 @@
 
 {% block welcome %}
     {% if user.is_authenticated %}
-        <div class="navbar-text mr-3 d-none d-md-inline-flex">{% trans 'Welcome back,' %} {{ user.first_name }}</div>
+        <div class="navbar-text mr-3 d-none d-md-inline-flex">{% trans 'Welcome back,' %} {{ user.profile.fullname }}</div>
     {% endif %}
 {% endblock %}