From 6dcfde5057b089e9f38862fcb73f340acfefb105 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Fri, 1 Sep 2023 15:41:45 +0500 Subject: [PATCH 1/2] display name is now required in edit profile --- src/static/riot/profiles/profile_edit.tag | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/static/riot/profiles/profile_edit.tag b/src/static/riot/profiles/profile_edit.tag index a24c80433..b08bee584 100644 --- a/src/static/riot/profiles/profile_edit.tag +++ b/src/static/riot/profiles/profile_edit.tag @@ -109,6 +109,15 @@ } ] }, + display_name: { + identifier: 'display_name', + rules: [ + { + type: 'empty', + prompt: 'Please enter a display name' + } + ] + }, personal_url: { identifier: 'personal_url', optional: true, From 3e0e87f8f00589cec911aaa63d1dd32eb84d04d2 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Sat, 2 Sep 2023 14:37:09 +0500 Subject: [PATCH 2/2] display_name not unique anymore --- .../migrations/0011_auto_20230902_0936.py | 18 ++++++++++++++++++ src/apps/profiles/models.py | 2 +- src/static/riot/profiles/profile_edit.tag | 9 --------- 3 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 src/apps/profiles/migrations/0011_auto_20230902_0936.py diff --git a/src/apps/profiles/migrations/0011_auto_20230902_0936.py b/src/apps/profiles/migrations/0011_auto_20230902_0936.py new file mode 100644 index 000000000..dc04f0426 --- /dev/null +++ b/src/apps/profiles/migrations/0011_auto_20230902_0936.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.17 on 2023-09-02 09:36 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('profiles', '0010_auto_20201230_0034'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='display_name', + field=models.CharField(blank=True, max_length=50, null=True), + ), + ] diff --git a/src/apps/profiles/models.py b/src/apps/profiles/models.py index 200f64de6..67abeb665 100644 --- a/src/apps/profiles/models.py +++ b/src/apps/profiles/models.py @@ -46,7 +46,7 @@ class User(ChaHubSaveMixin, AbstractBaseUser, PermissionsMixin): slug = models.SlugField(max_length=50, default='', unique=True) photo = models.ImageField(upload_to=PathWrapper('profile_photos'), null=True, blank=True) email = models.EmailField(max_length=200, unique=True, null=True, blank=True) - display_name = models.CharField(max_length=50, unique=True, null=True, blank=True) + display_name = models.CharField(max_length=50, null=True, blank=True) first_name = models.CharField(max_length=200, unique=False, null=True, blank=True) last_name = models.CharField(max_length=200, unique=False, null=True, blank=True) title = models.CharField(max_length=200, unique=False, null=True, blank=True) diff --git a/src/static/riot/profiles/profile_edit.tag b/src/static/riot/profiles/profile_edit.tag index b08bee584..a24c80433 100644 --- a/src/static/riot/profiles/profile_edit.tag +++ b/src/static/riot/profiles/profile_edit.tag @@ -109,15 +109,6 @@ } ] }, - display_name: { - identifier: 'display_name', - rules: [ - { - type: 'empty', - prompt: 'Please enter a display name' - } - ] - }, personal_url: { identifier: 'personal_url', optional: true,