user setting default ingredient unit
This commit is contained in:
parent
8eb0c36665
commit
4f49b06704
@ -31,10 +31,11 @@ class UserPreferenceForm(forms.ModelForm):
|
|||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = UserPreference
|
model = UserPreference
|
||||||
fields = ('theme', 'nav_color')
|
fields = ('default_unit', 'theme', 'nav_color')
|
||||||
|
|
||||||
help_texts = {
|
help_texts = {
|
||||||
'nav_color': _('Color of the top navigation bar. Not all colors work with all themes, just try them out!')
|
'nav_color': _('Color of the top navigation bar. Not all colors work with all themes, just try them out!'),
|
||||||
|
'default_unit': _('Default Unit to be used when inserting a new ingredient into a recipe.')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
18
cookbook/migrations/0032_userpreference_default_unit.py
Normal file
18
cookbook/migrations/0032_userpreference_default_unit.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 3.0.4 on 2020-04-13 20:34
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('cookbook', '0031_auto_20200407_1841'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='userpreference',
|
||||||
|
name='default_unit',
|
||||||
|
field=models.CharField(default='g', max_length=32),
|
||||||
|
),
|
||||||
|
]
|
@ -44,6 +44,7 @@ class UserPreference(models.Model):
|
|||||||
user = models.OneToOneField(User, on_delete=models.CASCADE, primary_key=True)
|
user = models.OneToOneField(User, on_delete=models.CASCADE, primary_key=True)
|
||||||
theme = models.CharField(choices=THEMES, max_length=128, default=FLATLY)
|
theme = models.CharField(choices=THEMES, max_length=128, default=FLATLY)
|
||||||
nav_color = models.CharField(choices=COLORS, max_length=128, default=PRIMARY)
|
nav_color = models.CharField(choices=COLORS, max_length=128, default=PRIMARY)
|
||||||
|
default_unit = models.CharField(max_length=32, default='g')
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.user
|
return self.user
|
||||||
|
@ -189,7 +189,7 @@
|
|||||||
data.push({
|
data.push({
|
||||||
ingredient__name: "{% trans 'Ingredient' %}",
|
ingredient__name: "{% trans 'Ingredient' %}",
|
||||||
amount: "100",
|
amount: "100",
|
||||||
unit__name: "g",
|
unit__name: "{{ request.user.userpreference.default_unit }}",
|
||||||
note: "",
|
note: "",
|
||||||
id: Math.floor(Math.random() * 10000000),
|
id: Math.floor(Math.random() * 10000000),
|
||||||
delete: false,
|
delete: false,
|
||||||
|
@ -175,6 +175,7 @@ def settings(request):
|
|||||||
up = UserPreference(user=request.user)
|
up = UserPreference(user=request.user)
|
||||||
up.theme = form.cleaned_data['theme']
|
up.theme = form.cleaned_data['theme']
|
||||||
up.nav_color = form.cleaned_data['nav_color']
|
up.nav_color = form.cleaned_data['nav_color']
|
||||||
|
up.default_unit = form.cleaned_data['default_unit']
|
||||||
up.save()
|
up.save()
|
||||||
|
|
||||||
if 'user_name_form' in request.POST:
|
if 'user_name_form' in request.POST:
|
||||||
|
Loading…
Reference in New Issue
Block a user