Skip to content

Commit

Permalink
#2820 add suffix to profile and snapshot it
Browse files Browse the repository at this point in the history
  • Loading branch information
ajrbyers committed Aug 15, 2022
1 parent 7b1f88d commit c97b77f
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 10 deletions.
20 changes: 20 additions & 0 deletions src/core/migrations/0074_account_suffix.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.29 on 2022-08-15 11:42
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('core', '0073_auto_20220630_1608'),
]

operations = [
migrations.AddField(
model_name='account',
name='suffix',
field=models.CharField(blank=True, help_text='Name suffix eg. jr', max_length=300, null=True),
),
]
7 changes: 7 additions & 0 deletions src/core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,12 @@ class Account(AbstractBaseUser, PermissionsMixin):
activation_code = models.CharField(max_length=100, null=True, blank=True)
salutation = models.CharField(max_length=10, choices=SALUTATION_CHOICES, null=True, blank=True,
verbose_name=_('Salutation'))
suffix = models.CharField(
max_length=300,
null=True,
blank=True,
help_text=_('Name suffix eg. jr'),
)
biography = models.TextField(null=True, blank=True, verbose_name=_('Biography'))
orcid = models.CharField(max_length=40, null=True, blank=True, verbose_name=_('ORCiD'))
institution = models.CharField(max_length=1000, null=True, blank=True, verbose_name=_('Institution'))
Expand Down Expand Up @@ -427,6 +433,7 @@ def snapshot_self(self, article, force_update=True):
'institution': self.institution,
'department': self.department,
'display_email': True if self == article.correspondence_author else False,
'name_suffix': self.suffix,
}

frozen_author = self.frozen_author(article)
Expand Down
8 changes: 4 additions & 4 deletions src/templates/admin/core/manager/users/edit.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{% block title-sub %}{% if active == 'add' %}Add New User{% else %}Edit User{% endif %}{% endblock %}

{% block body %}
<div class="large-8 columns end">
<div class="large-12 columns end">

<div class="box">
<div class="title-area">
Expand Down Expand Up @@ -58,14 +58,14 @@ <h2>{% if active == 'add' %}Add User{% else %}Edit {{ registration_form.email.va
</div>
</div>
{% endif %}
{% include "elements/forms/errors.html" with form=form %}
{% include "elements/accounts/user_form.html" with form=form %}
{% include "admin/elements/forms/errors.html" with form=form %}
{% include "admin/elements/accounts/user_form.html" with form=form %}

<button name="register" id="register" type="submit" class="pull-right success button"
style="width:150px;margin-left:15px;">
<i class="fa fa-user"></i> {% if active == 'update' %}Update Profile{% else %}Save New User{% endif %}
</button>
</br> </br>
<br/> <br/>
</form>
</div>
</div>
Expand Down
7 changes: 5 additions & 2 deletions src/templates/admin/elements/accounts/user_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,21 @@ <h5>Core Data</h5>
<div class="large-12 columns">
{{ form.email|foundation }}
</div>
<div class="large-3 columns">
<div class="large-2 columns">
{{ form.salutation|foundation }}
</div>
<div class="large-3 columns">
{{ form.first_name|foundation }}
</div>
<div class="large-3 columns">
<div class="large-2 columns">
{{ form.middle_name|foundation }}
</div>
<div class="large-3 columns">
{{ form.last_name|foundation }}
</div>
<div class="large-2 columns">
{{ form.suffix|foundation }}
</div>
</div>
<div class="row">
<div class="large-4 columns">
Expand Down
5 changes: 4 additions & 1 deletion src/themes/OLH/templates/elements/accounts/user_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h5>{% trans 'Core Data' %}</h5>
<div class="large-12 columns">
{{ form.email|foundation }}
</div>
<div class="large-3 columns">
<div class="large-2 columns">
{{ form.salutation|foundation }}
</div>
<div class="large-3 columns">
Expand All @@ -19,6 +19,9 @@ <h5>{% trans 'Core Data' %}</h5>
<div class="large-3 columns">
{{ form.last_name|foundation }}
</div>
<div class="large-1 columns">
{{ form.suffix|foundation }}
</div>
</div>
<div class="row">
<div class="large-3 columns">
Expand Down
7 changes: 5 additions & 2 deletions src/themes/clean/templates/elements/accounts/user_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<h5>{% trans 'Core Data' %}</h5>
<div class="row">
<div class="col-md-3">
<div class="col-md-2">
{% bootstrap_field form.salutation %}
</div>
<div class="col-md-3">
Expand All @@ -16,6 +16,9 @@ <h5>{% trans 'Core Data' %}</h5>
<div class="col-md-3">
{% bootstrap_field form.last_name %}
</div>
<div class="col-md-1">
{% bootstrap_field form.suffix %}
</div>
</div>
<div class="row">
<div class="col-md-3">
Expand Down Expand Up @@ -89,7 +92,7 @@ <h5>{% trans 'Profile Image' %}</h5>
<h5>{% trans 'Options' %}</h5>
<div class="row">
<div class="col-md-4">
{% bootstrap_field form.enable_digest %}

{% bootstrap_field form.enable_public_profile %}
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<h5>{% trans "Core Data" %}</h5>
<div class="row">
<div class="col m3">
<div class="col m2">
{% bootstrap_field form.salutation %}
</div>
<div class="col m3">
Expand All @@ -17,6 +17,9 @@ <h5>{% trans "Core Data" %}</h5>
<div class="col m3">
{% bootstrap_field form.last_name %}
</div>
<div class="col m1">
{% bootstrap_field form.suffix %}
</div>
</div>
<div class="row">
<div class="col m3">
Expand Down

0 comments on commit c97b77f

Please # to comment.