Skip to content
Snippets Groups Projects
Commit d068a898 authored by Eric's avatar Eric
Browse files

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
parents 8ac03362 828101f0
No related branches found
No related tags found
1 merge request!81Resolve "add last name + file hash in dataset form dropdown"
......@@ -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):
......
......@@ -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 %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment