Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Remove user Foreign Key from ingredients

Roland Geider009f3d7508e1
diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.py
index b48992a51..a9ac43ff5 100644
--- a/wger/nutrition/api/views.py
+++ b/wger/nutrition/api/views.py
@@ -61,7 +61,6 @@ class IngredientViewSet(viewsets.ReadOnlyModelViewSet):
'status',
'update_date',
'language',
- 'user',
'license',
'license_author')
@@ -128,7 +127,7 @@ def search(request):
languages = load_ingredient_languages(request)
ingredients = Ingredient.objects.filter(name__icontains=q,
language__in=languages,
- status__in=Ingredient.INGREDIENT_STATUS_OK)
+ status=Ingredient.STATUS_ACCEPTED)
for ingredient in ingredients:
ingredient_json = {
diff --git a/wger/nutrition/fixtures/test-ingredients.json b/wger/nutrition/fixtures/test-ingredients.json
index 55acccded..e92594fce 100644
--- a/wger/nutrition/fixtures/test-ingredients.json
+++ b/wger/nutrition/fixtures/test-ingredients.json
@@ -1,281 +1,281 @@
[
{
- "pk": 1,
- "model": "nutrition.ingredient",
+ "pk": 1,
+ "model": "nutrition.ingredient",
"fields": {
- "status": "5",
- "user": null,
+ "status": "2",
+ "license_author": "wger test",
"update_date": "2013-02-12",
"creation_date": "2013-01-01",
- "name": "Test ingredient 1",
- "language": 2,
- "sodium": "0.549",
- "energy": 176,
- "fat": "8.19",
- "carbohydrates_sugar": "0.0",
- "fat_saturated": "3.244",
- "fibres": "0.0",
- "protein": "25.63",
+ "name": "Test ingredient 1",
+ "language": 2,
+ "sodium": "0.549",
+ "energy": 176,
+ "fat": "8.19",
+ "carbohydrates_sugar": "0.0",
+ "fat_saturated": "3.244",
+ "fibres": "0.0",
+ "protein": "25.63",
"carbohydrates": "0.1251"
}
},
{
- "pk": 2,
- "model": "nutrition.ingredient",
+ "pk": 2,
+ "model": "nutrition.ingredient",
"fields": {
- "status": "5",
- "user": null,
+ "status": "2",
+ "license_author": "wger test",
"name": "Ingredient, test, 2, organic, raw",
"update_date": "2013-02-12",
- "creation_date": "2013-01-01",
- "language": 2,
- "sodium": "0.1",
- "energy": 300,
- "fat": "9",
- "carbohydrates_sugar": "1",
- "fat_saturated": "3",
- "fibres": "5.0",
- "protein": "25.63",
+ "creation_date": "2013-01-01",
+ "language": 2,
+ "sodium": "0.1",
+ "energy": 300,
+ "fat": "9",
+ "carbohydrates_sugar": "1",
+ "fat_saturated": "3",
+ "fibres": "5.0",
+ "protein": "25.63",
"carbohydrates": "0.1251"
}
},
{
- "pk": 3,
- "model": "nutrition.ingredient",
+ "pk": 3,
+ "model": "nutrition.ingredient",
"fields": {
- "status": "5",
- "user": null,
+ "status": "2",
+ "license_author": "wger test",
"update_date": "2013-03-22",
"creation_date": "2013-02-03",
- "name": "Bachelor chow, now with flavour!",
- "language": 2,
- "sodium": "0.1",
- "energy": 300,
- "fat": "9",
- "carbohydrates_sugar": "1",
- "fat_saturated": "3",
- "fibres": "5.0",
- "protein": "25.63",
+ "name": "Bachelor chow, now with flavour!",
+ "language": 2,
+ "sodium": "0.1",
+ "energy": 300,
+ "fat": "9",
+ "carbohydrates_sugar": "1",
+ "fat_saturated": "3",
+ "fibres": "5.0",
+ "protein": "25.63",
"carbohydrates": "0.1551"
}
},
{
- "pk": 4,
- "model": "nutrition.ingredient",
+ "pk": 4,
+ "model": "nutrition.ingredient",
"fields": {
- "status": "5",
- "user": null,
+ "status": "2",
+ "license_author": "wger test",
"update_date": "2013-02-12",
"creation_date": "2013-04-05",
- "name": "Slurm",
- "language": 2,
- "sodium": "0.1",
- "energy": 500,
- "fat": "1",
- "carbohydrates_sugar": "99",
- "fat_saturated": "0",
- "fibres": "0",
- "protein": "0",
+ "name": "Slurm",
+ "language": 2,
+ "sodium": "0.1",
+ "energy": 500,
+ "fat": "1",
+ "carbohydrates_sugar": "99",
+ "fat_saturated": "0",
+ "fibres": "0",
+ "protein": "0",
"carbohydrates": "99.0"
}
},
{
- "pk": 5,
- "model": "nutrition.ingredient",
+ "pk": 5,
+ "model": "nutrition.ingredient",
"fields": {
- "status": "5",
- "user": null,
+ "status": "2",
+ "license_author": "wger test",
"update_date": "2013-02-12",
"creation_date": "2013-04-05",
- "name": "Another tasty ingredient",
- "language": 2,
- "sodium": "2.1",
- "energy": 10,
- "fat": "1",
- "carbohydrates_sugar": "4",
- "fat_saturated": "0",
- "fibres": "0",
- "protein": "0",
+ "name": "Another tasty ingredient",
+ "language": 2,
+ "sodium": "2.1",
+ "energy": 10,
+ "fat": "1",
+ "carbohydrates_sugar": "4",
+ "fat_saturated": "0",
+ "fibres": "0",
+ "protein": "0",
"carbohydrates": "5.0"
}
},
{
- "pk": 6,
- "model": "nutrition.ingredient",
+ "pk": 6,
+ "model": "nutrition.ingredient",
"fields": {
- "status": "5",
- "user": null,
+ "status": "2",
+ "license_author": "wger test",
"update_date": "2013-02-12",
"creation_date": "2013-04-05",
- "name": "Raw ingredient",
- "language": 2,
- "sodium": "2.1",
- "energy": 180,
- "fat": "2",
- "carbohydrates_sugar": "4",
- "fat_saturated": "0",
- "fibres": "20",
- "protein": "10",
+ "name": "Raw ingredient",
+ "language": 2,
+ "sodium": "2.1",
+ "energy": 180,
+ "fat": "2",
+ "carbohydrates_sugar": "4",
+ "fat_saturated": "0",
+ "fibres": "20",
+ "protein": "10",
"carbohydrates": "5.0"
}
},
{
- "pk": 7,
- "model": "nutrition.ingredient",
+ "pk": 7,
+ "model": "nutrition.ingredient",
"fields": {
"status": "1",
- "user": 2,
+ "license_author": "test",
"update_date": "2013-02-12",
"creation_date": "2013-04-05",
- "name": "Pending ingredient",
- "language": 2,
- "sodium": "2.1",
- "energy": 180,
- "fat": "2",
- "carbohydrates_sugar": "4",
- "fat_saturated": "0",
- "fibres": "20",
- "protein": "10",
+ "name": "Pending ingredient",
+ "language": 2,
+ "sodium": "2.1",
+ "energy": 180,
+ "fat": "2",
+ "carbohydrates_sugar": "4",
+ "fat_saturated": "0",
+ "fibres": "20",
+ "protein": "10",
"carbohydrates": "5.0"
}
},
{
- "pk": 2126,
- "model": "nutrition.ingredient",
+ "pk": 2126,
+ "model": "nutrition.ingredient",
"fields": {
- "status": "5",
- "user": 2,
+ "status": "2",
+ "license_author": "test",
"update_date": "2013-02-12",
"creation_date": "2013-04-05",
- "name": "Needed for guest user",
- "language": 2,
- "sodium": "2.1",
- "energy": 180,
- "fat": "2",
- "carbohydrates_sugar": "4",
- "fat_saturated": "0",
- "fibres": "20",
- "protein": "10",
+ "name": "Needed for guest user",
+ "language": 2,
+ "sodium": "2.1",
+ "energy": 180,
+ "fat": "2",
+ "carbohydrates_sugar": "4",
+ "fat_saturated": "0",
+ "fibres": "20",
+ "protein": "10",
"carbohydrates": "5.0"
}
},
{
- "pk": 154,
- "model": "nutrition.ingredient",
+ "pk": 154,
+ "model": "nutrition.ingredient",
"fields": {
- "status": "5",
- "user": 2,
+ "status": "2",
+ "license_author": "test",
"update_date": "2013-02-12",
"creation_date": "2013-04-05",
- "name": "Needed for guest user",
- "language": 2,
- "sodium": "2.1",
- "energy": 180,
- "fat": "2",
- "carbohydrates_sugar": "4",
- "fat_saturated": "0",
- "fibres": "20",
- "protein": "10",
+ "name": "Needed for guest user",
+ "language": 2,
+ "sodium": "2.1",
+ "energy": 180,
+ "fat": "2",
+ "carbohydrates_sugar": "4",
+ "fat_saturated": "0",
+ "fibres": "20",
+ "protein": "10",
"carbohydrates": "5.0"
}
},
{
- "pk": 5370,
- "model": "nutrition.ingredient",
+ "pk": 5370,
+ "model": "nutrition.ingredient",
"fields": {
- "status": "5",
- "user": 2,
+ "status": "2",
+ "license_author": "test",
"update_date": "2013-02-12",
"creation_date": "2013-04-05",
- "name": "Needed for guest user",
- "language": 2,
- "sodium": "2.1",
- "energy": 180,
- "fat": "2",
- "carbohydrates_sugar": "4",
- "fat_saturated": "0",
- "fibres": "20",
- "protein": "10",
+ "name": "Needed for guest user",
+ "language": 2,
+ "sodium": "2.1",
+ "energy": 180,
+ "fat": "2",
+ "carbohydrates_sugar": "4",
+ "fat_saturated": "0",
+ "fibres": "20",
+ "protein": "10",
"carbohydrates": "5.0"
}
},
{
- "pk": 1643,
- "model": "nutrition.ingredient",
+ "pk": 1643,
+ "model": "nutrition.ingredient",
"fields": {
- "status": "5",
- "user": 2,
+ "status": "2",
+ "license_author": "test",
"update_date": "2013-02-12",
"creation_date": "2013-04-05",
- "name": "Needed for guest user",
- "language": 2,
- "sodium": "2.1",
- "energy": 180,
- "fat": "2",
- "carbohydrates_sugar": "4",
- "fat_saturated": "0",
- "fibres": "20",
- "protein": "10",
+ "name": "Needed for guest user",
+ "language": 2,
+ "sodium": "2.1",
+ "energy": 180,
+ "fat": "2",
+ "carbohydrates_sugar": "4",
+ "fat_saturated": "0",
+ "fibres": "20",
+ "protein": "10",
"carbohydrates": "5.0"
}
},
{
- "pk": 17,
- "model": "nutrition.ingredient",
+ "pk": 17,
+ "model": "nutrition.ingredient",
"fields": {
- "status": "5",
- "user": 2,
+ "status": "2",
+ "license_author": "test",
"update_date": "2013-02-12",
"creation_date": "2013-04-05",
- "name": "Needed for guest user",
- "language": 2,
- "sodium": "2.1",
- "energy": 180,
- "fat": "2",
- "carbohydrates_sugar": "4",
- "fat_saturated": "0",
- "fibres": "20",
- "protein": "10",
+ "name": "Needed for guest user",
+ "language": 2,
+ "sodium": "2.1",
+ "energy": 180,
+ "fat": "2",
+ "carbohydrates_sugar": "4",
+ "fat_saturated": "0",
+ "fibres": "20",
+ "protein": "10",
"carbohydrates": "5.0"
}
},
{
- "pk": 3208,
- "model": "nutrition.ingredient",
+ "pk": 3208,
+ "model": "nutrition.ingredient",
"fields": {
- "status": "5",
- "user": 2,
+ "status": "2",
+ "license_author": "test",
"update_date": "2013-02-12",
"creation_date": "2013-04-05",
- "name": "Needed for guest user",
- "language": 2,
- "sodium": "2.1",
- "energy": 180,
- "fat": "2",
- "carbohydrates_sugar": "4",
- "fat_saturated": "0",
- "fibres": "20",
- "protein": "10",
+ "name": "Needed for guest user",
+ "language": 2,
+ "sodium": "2.1",
+ "energy": 180,
+ "fat": "2",
+ "carbohydrates_sugar": "4",
+ "fat_saturated": "0",
+ "fibres": "20",
+ "protein": "10",
"carbohydrates": "5.0"
}
},
{
- "pk": 196,
- "model": "nutrition.ingredient",
+ "pk": 196,
+ "model": "nutrition.ingredient",
"fields": {
- "status": "5",
- "user": 2,
+ "status": "2",
+ "license_author": "test",
"update_date": "2013-02-12",
"creation_date": "2013-04-05",
- "name": "Needed for guest user",
- "language": 2,
- "sodium": "2.1",
- "energy": 180,
- "fat": "2",
- "carbohydrates_sugar": "4",
- "fat_saturated": "0",
- "fibres": "20",
- "protein": "10",
+ "name": "Needed for guest user",
+ "language": 2,
+ "sodium": "2.1",
+ "energy": 180,
+ "fat": "2",
+ "carbohydrates_sugar": "4",
+ "fat_saturated": "0",
+ "fibres": "20",
+ "protein": "10",
"carbohydrates": "5.0"
}
},
diff --git a/wger/nutrition/migrations/0002_auto_20170101_1538.py b/wger/nutrition/migrations/0002_auto_20170101_1538.py
new file mode 100644
index 000000000..b71c78c92
--- /dev/null
+++ b/wger/nutrition/migrations/0002_auto_20170101_1538.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.12 on 2017-01-01 14:38
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+def copy_username(apps, schema_editor):
+ '''
+ Copies the exercise name to the original name field
+ '''
+ Ingredient = apps.get_model("nutrition", "Ingredient")
+ for ingredient in Ingredient.objects.all():
+ if ingredient.user:
+ ingredient.license_author = ingredient.user.username
+ else:
+ ingredient.license_author = 'wger.de'
+ ingredient.save()
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('nutrition', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='meal',
+ name='order',
+ field=models.IntegerField(blank=True, editable=False, verbose_name='Order'),
+ ),
+ migrations.AlterField(
+ model_name='mealitem',
+ name='order',
+ field=models.IntegerField(blank=True, editable=False, verbose_name='Order'),
+ ),
+ migrations.RunPython(copy_username, reverse_code=migrations.RunPython.noop),
+ migrations.RemoveField(
+ model_name='ingredient',
+ name='user',
+ ),
+ migrations.AlterField(
+ model_name='ingredient',
+ name='status',
+ field=models.CharField(choices=[('1', 'Pending'), ('2', 'Accepted'), ('3', 'Declined')], default='1',
+ editable=False, max_length=2),
+ ),
+ ]
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index 427192c7c..f472fd38c 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -37,7 +37,7 @@ from wger.core.models import Language
from wger.utils.constants import TWOPLACES
from wger.utils.cache import cache_mapper
from wger.utils.fields import Html5TimeField
-from wger.utils.models import AbstractLicenseModel
+from wger.utils.models import AbstractLicenseModel, AbstractSubmissionModel
from wger.utils.units import AbstractWeight
from wger.weight.models import WeightEntry
@@ -201,7 +201,7 @@ class NutritionPlan(models.Model):
@python_2_unicode_compatible
-class Ingredient(AbstractLicenseModel, models.Model):
+class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
'''
An ingredient, with some approximate nutrition values
'''
@@ -212,24 +212,6 @@ class Ingredient(AbstractLicenseModel, models.Model):
energy amount given (in percent).
'''
- INGREDIENT_STATUS_PENDING = '1'
- INGREDIENT_STATUS_ACCEPTED = '2'
- INGREDIENT_STATUS_DECLINED = '3'
- INGREDIENT_STATUS_ADMIN = '4'
- INGREDIENT_STATUS_SYSTEM = '5'
-
- INGREDIENT_STATUS_OK = (INGREDIENT_STATUS_ACCEPTED,
- INGREDIENT_STATUS_ADMIN,
- INGREDIENT_STATUS_SYSTEM)
-
- INGREDIENT_STATUS = (
- (INGREDIENT_STATUS_PENDING, _('Pending')),
- (INGREDIENT_STATUS_ACCEPTED, _('Accepted')),
- (INGREDIENT_STATUS_DECLINED, _('Declined')),
- (INGREDIENT_STATUS_ADMIN, _('Submitted by administrator')),
- (INGREDIENT_STATUS_SYSTEM, _('System ingredient')),
- )
-
# Metaclass to set some other properties
class Meta:
ordering = ["name", ]
@@ -238,19 +220,6 @@ class Ingredient(AbstractLicenseModel, models.Model):
verbose_name=_('Language'),
editable=False)
- user = models.ForeignKey(User,
- verbose_name=_('User'),
- null=True,
- blank=True,
- editable=False)
- '''The user that submitted the exercise'''
-
- status = models.CharField(max_length=2,
- choices=INGREDIENT_STATUS,
- default=INGREDIENT_STATUS_PENDING,
- editable=False)
- '''The status of an ingredient'''
-
creation_date = models.DateField(_('Date'), auto_now_add=True)
update_date = models.DateField(_('Date'),
auto_now=True,
@@ -422,8 +391,13 @@ class Ingredient(AbstractLicenseModel, models.Model):
Sends an email after being successfully added to the database (for user
submitted ingredients only)
'''
- if self.user and self.user.email:
- translation.activate(self.user.userprofile.notification_language.short_name)
+ try:
+ user = User.objects.get(username=self.license_author)
+ except User.DoesNotExist:
+ return
+
+ if self.license_author and user.email:
+ translation.activate(user.userprofile.notification_language.short_name)
url = request.build_absolute_uri(self.get_absolute_url())
subject = _('Ingredient was successfully added to the general database')
context = {
@@ -435,9 +409,26 @@ class Ingredient(AbstractLicenseModel, models.Model):
mail.send_mail(subject,
message,
settings.WGER_SETTINGS['EMAIL_FROM'],
- [self.user.email],
+ [user.email],
fail_silently=True)
+ def set_author(self, request):
+ if request.user.has_perm('nutrition.add_ingredient'):
+ self.status = Ingredient.STATUS_ACCEPTED
+ if not self.license_author:
+ self.license_author = request.get_host().split(':')[0]
+ else:
+ if not self.license_author:
+ self.license_author = request.user.username
+
+ # Send email to administrator
+ subject = _('New user submitted ingredient')
+ message = _(u'''The user {0} submitted a new ingredient "{1}".'''.format(
+ request.user.username, self.name))
+ mail.mail_admins(subject,
+ message,
+ fail_silently=True)
+
def get_owner_object(self):
'''
Ingredient has no owner information
diff --git a/wger/nutrition/sitemap.py b/wger/nutrition/sitemap.py
index 600d982b1..db92daed7 100644
--- a/wger/nutrition/sitemap.py
+++ b/wger/nutrition/sitemap.py
@@ -26,4 +26,4 @@ class NutritionSitemap(Sitemap):
def items(self):
return (Ingredient.objects.filter(language=load_language())
- .filter(status__in=Ingredient.INGREDIENT_STATUS_OK))
+ .filter(status=Ingredient.STATUS_ACCEPTED))
diff --git a/wger/nutrition/templates/ingredient/view.html b/wger/nutrition/templates/ingredient/view.html
index 4190af912..8e4bc393f 100644
--- a/wger/nutrition/templates/ingredient/view.html
+++ b/wger/nutrition/templates/ingredient/view.html
@@ -22,7 +22,7 @@ $(document).ready(function() {
{% block content %}
-{% if ingredient.status == ingredient.INGREDIENT_STATUS_PENDING %}
+{% if ingredient.status == ingredient.STATUS_PENDING %}
<div class="alert">
<h4>{% trans "Ingredient is pending review" %}</h4>
<p>{% blocktrans %}This user submitted ingredient is pending a decision to be
diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.py
index 37edecfef..5b03f8bd4 100644
--- a/wger/nutrition/tests/test_ingredient.py
+++ b/wger/nutrition/tests/test_ingredient.py
@@ -111,10 +111,10 @@ class AddIngredientTestCase(WorkoutManagerAddTestCase):
if self.current_user == 'admin':
ingredient = Ingredient.objects.get(pk=self.pk_after)
self.assertEqual(ingredient.creation_date, datetime.date.today())
- self.assertEqual(ingredient.status, Ingredient.INGREDIENT_STATUS_ADMIN)
+ self.assertEqual(ingredient.status, Ingredient.STATUS_ACCEPTED)
elif self.current_user == 'test':
ingredient = Ingredient.objects.get(pk=self.pk_after)
- self.assertEqual(ingredient.status, Ingredient.INGREDIENT_STATUS_PENDING)
+ self.assertEqual(ingredient.status, Ingredient.STATUS_PENDING)
class IngredientDetailTestCase(WorkoutManagerTestCase):
diff --git a/wger/nutrition/tests/test_submitted_ingredient.py b/wger/nutrition/tests/test_submitted_ingredient.py
index 5e6db8327..3cdfe751f 100644
--- a/wger/nutrition/tests/test_submitted_ingredient.py
+++ b/wger/nutrition/tests/test_submitted_ingredient.py
@@ -115,18 +115,18 @@ class IngredientAcceptTestCase(WorkoutManagerTestCase):
Helper function
'''
ingredient = Ingredient.objects.get(pk=7)
- self.assertEqual(ingredient.status, Ingredient.INGREDIENT_STATUS_PENDING)
+ self.assertEqual(ingredient.status, Ingredient.STATUS_PENDING)
response = self.client.get(reverse('nutrition:ingredient:accept', kwargs={'pk': 7}))
ingredient = Ingredient.objects.get(pk=7)
self.assertEqual(response.status_code, 302)
if not fail:
- self.assertEqual(ingredient.status, Ingredient.INGREDIENT_STATUS_ACCEPTED)
+ self.assertEqual(ingredient.status, Ingredient.STATUS_ACCEPTED)
response = self.client.get(response['Location'])
self.assertEqual(response.status_code, 200)
self.assertEqual(len(mail.outbox), 1)
else:
- self.assertEqual(ingredient.status, Ingredient.INGREDIENT_STATUS_PENDING)
+ self.assertEqual(ingredient.status, Ingredient.STATUS_PENDING)
self.assertEqual(len(mail.outbox), 0)
def test_accept_admin(self):
@@ -163,18 +163,18 @@ class IngredientRejectTestCase(WorkoutManagerTestCase):
Helper function
'''
ingredient = Ingredient.objects.get(pk=7)
- self.assertEqual(ingredient.status, Ingredient.INGREDIENT_STATUS_PENDING)
+ self.assertEqual(ingredient.status, Ingredient.STATUS_PENDING)
response = self.client.get(reverse('nutrition:ingredient:decline', kwargs={'pk': 7}))
ingredient = Ingredient.objects.get(pk=7)
self.assertEqual(response.status_code, 302)
if not fail:
- self.assertEqual(ingredient.status, Ingredient.INGREDIENT_STATUS_DECLINED)
+ self.assertEqual(ingredient.status, Ingredient.STATUS_DECLINED)
response = self.client.get(response['Location'])
self.assertEqual(response.status_code, 200)
else:
- self.assertEqual(ingredient.status, Ingredient.INGREDIENT_STATUS_PENDING)
+ self.assertEqual(ingredient.status, Ingredient.STATUS_PENDING)
def test_reject_admin(self):
'''
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index 03750bc4c..74d6571c2 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -66,7 +66,7 @@ class IngredientListView(ListView):
'''
languages = load_ingredient_languages(self.request)
return (Ingredient.objects.filter(language__in=languages)
- .filter(status__in=Ingredient.INGREDIENT_STATUS_OK)
+ .filter(status=Ingredient.STATUS_ACCEPTED)
.only('id', 'name'))
def get_context_data(self, **kwargs):
@@ -176,19 +176,8 @@ class IngredientCreateView(IngredientMixin, CreateView):
def form_valid(self, form):
- # set the submitter, if admin, set approrpiate status
- form.instance.user = self.request.user
- if self.request.user.has_perm('nutrition.add_ingredient'):
- form.instance.status = Ingredient.INGREDIENT_STATUS_ADMIN
- else:
- subject = _('New user submitted ingredient')
- message = _(u'''The user {0} submitted a new ingredient "{1}".'''.format(
- self.request.user.username, form.instance.name))
- mail.mail_admins(subject,
- message,
- fail_silently=True)
-
form.instance.language = load_language()
+ form.instance.set_author(self.request)
return super(IngredientCreateView, self).form_valid(form)
def dispatch(self, request, *args, **kwargs):
@@ -214,7 +203,7 @@ class PendingIngredientListView(LoginRequiredMixin, PermissionRequiredMixin, Lis
'''
Only show ingredients pending review
'''
- return Ingredient.objects.filter(status=Ingredient.INGREDIENT_STATUS_PENDING) \
+ return Ingredient.objects.filter(status=Ingredient.STATUS_PENDING) \
.order_by('-creation_date')
@@ -224,7 +213,7 @@ def accept(request, pk):
Accepts a pending user submitted ingredient
'''
ingredient = get_object_or_404(Ingredient, pk=pk)
- ingredient.status = Ingredient.INGREDIENT_STATUS_ACCEPTED
+ ingredient.status = Ingredient.STATUS_ACCEPTED
ingredient.save()
ingredient.send_email(request)
messages.success(request, _('Ingredient was successfully added to the general database'))
@@ -238,7 +227,7 @@ def decline(request, pk):
Declines and deletes a pending user submitted ingredient
'''
ingredient = get_object_or_404(Ingredient, pk=pk)
- ingredient.status = Ingredient.INGREDIENT_STATUS_DECLINED
+ ingredient.status = Ingredient.STATUS_DECLINED
ingredient.save()
messages.success(request, _('Ingredient was successfully marked as rejected'))
return HttpResponseRedirect(ingredient.get_absolute_url())