diff --git a/scipost/templates/scipost/_public_info_as_table.html b/scipost/templates/scipost/_public_info_as_table.html index 2a5dee4578da777288e5279b34a2bac0717eced8..9b2e85237f65fe2358a96ee2441844b27cd8074d 100644 --- a/scipost/templates/scipost/_public_info_as_table.html +++ b/scipost/templates/scipost/_public_info_as_table.html @@ -15,7 +15,10 @@ </td> </tr> <tr><td>Personal web page: </td><td>{{ contributor.personalwebpage|default:'-' }}</td></tr> + {% if perms.scipost.can_vet_registration_requests %} + <tr><td>Username</td><td>{{ contributor.user.username }}</td></tr> + <tr><td>Email (from User)</td><td>{{ contributor.user.email }}</td></tr> <tr><td>Status</td><td>{{ contributor.get_status_display }}</td></tr> <tr><td>User active?</td><td>{{ contributor.user.is_active }}</td></tr> <tr><td>Id</td><td>{{ contributor.id }}{% if contributor.profile %} <a href="{% url 'profiles:profile_detail' pk=contributor.profile.id %}">View Profile <i class="fa fa-arrow-right"></i></a>{% endif %}</td></tr> diff --git a/scipost/templates/scipost/contributor_merge.html b/scipost/templates/scipost/contributor_merge.html index e743d2cf8bc258305424e6a8f1ccc6d573fc46d0..8589170711c51d3a0eeb77853ac0668b7d551a5f 100644 --- a/scipost/templates/scipost/contributor_merge.html +++ b/scipost/templates/scipost/contributor_merge.html @@ -42,6 +42,7 @@ {% csrf_token %} {{ merge_form|bootstrap }} <input class="btn btn-primary" type="submit" value="Confirm merge"> + <a class="text-warning" href="{% url 'scipost:contributor_merge' %}?to_merge={{ contributor_to_merge_into.id }}&to_merge_into={{ contributor_to_merge.id }}" method="get">Merge the other way around</a></p> </form> </div> </div>