From 454726b235d8247e1b046addfed3ba2156cf8d75 Mon Sep 17 00:00:00 2001 From: Mike M Date: Thu, 29 Apr 2021 19:02:17 -0400 Subject: [PATCH 1/3] add featured team, closes #131 --- profiles/forms.py | 9 ++++++--- .../migrations/0006_userprofile_feat_team.py | 20 +++++++++++++++++++ .../migrations/0007_auto_20210429_1901.py | 19 ++++++++++++++++++ profiles/models.py | 2 ++ project-templates/profiles/edit_profile.html | 3 +++ 5 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 profiles/migrations/0006_userprofile_feat_team.py create mode 100644 profiles/migrations/0007_auto_20210429_1901.py diff --git a/profiles/forms.py b/profiles/forms.py index 8e22272e..9194523c 100644 --- a/profiles/forms.py +++ b/profiles/forms.py @@ -36,13 +36,16 @@ class Meta: 'favorite_game', 'favorite_console', 'country', - 'email_enabled' + 'email_enabled', + 'feat_team' ) def __init__(self, *args, **kwargs): super(EditProfileForm, self).__init__(*args, **kwargs) - self.fields['email_enabled'].widget.attrs.update({'name': 'email_enabled', 'class': 'form-control', - 'style': 'background-color: black;'}) + self.fields['feat_team'].queryset = self.instance.founder_teams.all() | self.instance.captain_teams.all() | self.instance.player_teams.all() + # super(EditProfileForm, self).__init__(*args, **kwargs) + # self.fields['email_enabled'].widget.attrs.update({'name': 'email_enabled', 'class': 'form-control', + # 'style': 'background-color: black;'}) class SortForm(forms.Form): # it works but is messy af. should be replaced with something like diff --git a/profiles/migrations/0006_userprofile_feat_team.py b/profiles/migrations/0006_userprofile_feat_team.py new file mode 100644 index 00000000..ef2e3e8d --- /dev/null +++ b/profiles/migrations/0006_userprofile_feat_team.py @@ -0,0 +1,20 @@ +# Generated by Django 2.2.12 on 2021-04-29 22:39 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0003_team_tag'), + ('profiles', '0005_auto_20210202_1702'), + ] + + operations = [ + migrations.AddField( + model_name='userprofile', + name='feat_team', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='profile_feat_team', to='teams.Team'), + ), + ] diff --git a/profiles/migrations/0007_auto_20210429_1901.py b/profiles/migrations/0007_auto_20210429_1901.py new file mode 100644 index 00000000..30eeee31 --- /dev/null +++ b/profiles/migrations/0007_auto_20210429_1901.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.12 on 2021-04-29 23:01 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('profiles', '0006_userprofile_feat_team'), + ] + + operations = [ + migrations.AlterField( + model_name='userprofile', + name='feat_team', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='profile_feat_team', to='teams.Team'), + ), + ] diff --git a/profiles/models.py b/profiles/models.py index 4d8322d5..ce629007 100644 --- a/profiles/models.py +++ b/profiles/models.py @@ -94,6 +94,8 @@ def __str__(self): country = CountryField(blank_label='(select country)', default='US') email_enabled = models.BooleanField(default=True) + # team to display on their profile + feat_team = models.ForeignKey('teams.Team', related_name='profile_feat_team', blank=True, null=True, on_delete=models.SET_NULL) # teams the user founded founder_teams = models.ManyToManyField('teams.Team', related_name='profile_founder_teams', blank=True) # teams the user is a captain of diff --git a/project-templates/profiles/edit_profile.html b/project-templates/profiles/edit_profile.html index e308bc41..42f8bafc 100644 --- a/project-templates/profiles/edit_profile.html +++ b/project-templates/profiles/edit_profile.html @@ -19,6 +19,9 @@
{{ form.alternate_name }}
+ +
{{ form.feat_team }}
+
{{ form.xbl }}
From 8f2f6c2e3c70d6b944add75fc9fd65d6d0343ba5 Mon Sep 17 00:00:00 2001 From: Mike M Date: Thu, 6 May 2021 15:10:54 -0400 Subject: [PATCH 2/3] Update forms.py --- profiles/forms.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/profiles/forms.py b/profiles/forms.py index 9194523c..f8488f9e 100644 --- a/profiles/forms.py +++ b/profiles/forms.py @@ -43,13 +43,9 @@ class Meta: def __init__(self, *args, **kwargs): super(EditProfileForm, self).__init__(*args, **kwargs) self.fields['feat_team'].queryset = self.instance.founder_teams.all() | self.instance.captain_teams.all() | self.instance.player_teams.all() - # super(EditProfileForm, self).__init__(*args, **kwargs) - # self.fields['email_enabled'].widget.attrs.update({'name': 'email_enabled', 'class': 'form-control', - # 'style': 'background-color: black;'}) -class SortForm(forms.Form): # it works but is messy af. should be replaced with something like - # http://img.mulveyben.me/img/chrome_2018-03-11_22-04-28.png +class SortForm(forms.Form): # to be improved sort_xp_asc = forms.BooleanField(required=False) sort_xp_desc = forms.BooleanField(required=False) sort_trophies_asc = forms.BooleanField(required=False) From 139f9088b2e0813aac41f5f17290fdde09e8bd38 Mon Sep 17 00:00:00 2001 From: Mike M Date: Thu, 6 May 2021 15:12:47 -0400 Subject: [PATCH 3/3] rename feat_team to featured_team --- profiles/forms.py | 5 ++-- .../migrations/0008_auto_20210506_1512.py | 24 +++++++++++++++++++ profiles/models.py | 2 +- 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 profiles/migrations/0008_auto_20210506_1512.py diff --git a/profiles/forms.py b/profiles/forms.py index f8488f9e..f6829986 100644 --- a/profiles/forms.py +++ b/profiles/forms.py @@ -37,12 +37,13 @@ class Meta: 'favorite_console', 'country', 'email_enabled', - 'feat_team' + 'featured_team' ) def __init__(self, *args, **kwargs): super(EditProfileForm, self).__init__(*args, **kwargs) - self.fields['feat_team'].queryset = self.instance.founder_teams.all() | self.instance.captain_teams.all() | self.instance.player_teams.all() + self.fields[ + 'featured_team'].queryset = self.instance.founder_teams.all() | self.instance.captain_teams.all() | self.instance.player_teams.all() class SortForm(forms.Form): # to be improved diff --git a/profiles/migrations/0008_auto_20210506_1512.py b/profiles/migrations/0008_auto_20210506_1512.py new file mode 100644 index 00000000..1bb9a7aa --- /dev/null +++ b/profiles/migrations/0008_auto_20210506_1512.py @@ -0,0 +1,24 @@ +# Generated by Django 2.2.12 on 2021-05-06 19:12 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0003_team_tag'), + ('profiles', '0007_auto_20210429_1901'), + ] + + operations = [ + migrations.RemoveField( + model_name='userprofile', + name='feat_team', + ), + migrations.AddField( + model_name='userprofile', + name='featured_team', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='profile_featured_team', to='teams.Team'), + ), + ] diff --git a/profiles/models.py b/profiles/models.py index ce629007..61f6f308 100644 --- a/profiles/models.py +++ b/profiles/models.py @@ -95,7 +95,7 @@ def __str__(self): email_enabled = models.BooleanField(default=True) # team to display on their profile - feat_team = models.ForeignKey('teams.Team', related_name='profile_feat_team', blank=True, null=True, on_delete=models.SET_NULL) + featured_team = models.ForeignKey('teams.Team', related_name='profile_featured_team', blank=True, null=True, on_delete=models.SET_NULL) # teams the user founded founder_teams = models.ManyToManyField('teams.Team', related_name='profile_founder_teams', blank=True) # teams the user is a captain of