Add option to space to enable plural name usage

* Add option to space to enable usage of plural name
  for food and unit per space

* Respect option per space to use the plural name

cookbook/admin.py

@@ -36,7 +36,7 @@ def delete_space_action(modeladmin, request, queryset):
 
 
 class SpaceAdmin(admin.ModelAdmin):
-    list_display = ('name', 'created_by', 'max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing')
+    list_display = ('name', 'created_by', 'max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing', 'use_plural')
     search_fields = ('name', 'created_by__username')
     list_filter = ('max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing')
     date_hierarchy = 'created_at'

cookbook/forms.py

@@ -533,11 +533,13 @@ class SpacePreferenceForm(forms.ModelForm):
     class Meta:
         model = Space
 
-        fields = ('food_inherit', 'reset_food_inherit', 'show_facet_count')
+        fields = ('food_inherit', 'reset_food_inherit', 'show_facet_count', 'use_plural')
 
         help_texts = {
             'food_inherit': _('Fields on food that should be inherited by default.'),
-            'show_facet_count': _('Show recipe counts on search filters'), }
+            'show_facet_count': _('Show recipe counts on search filters'), 
+            'use_plural': _('Use the plural form for units and food inside this space.'),
+        }
 
         widgets = {
             'food_inherit': MultiSelectWidget

cookbook/helper/template_helper.py

@@ -31,13 +31,16 @@ class IngredientObject(object):
                     self.unit = bleach.clean(str(ingredient.unit))
         else:
             self.unit = ""
-        if ingredient.food.plural_name in (None, ""):
-            self.food = bleach.clean(str(ingredient.food))
-        else:
-            if ingredient.always_use_plural_food or ingredient.amount > 1 and not ingredient.no_amount:
-                self.food = bleach.clean(str(ingredient.food.plural_name))
-            else:
+        if ingredient.food:
+            if ingredient.food.plural_name in (None, ""):
                 self.food = bleach.clean(str(ingredient.food))
+            else:
+                if ingredient.always_use_plural_food or ingredient.amount > 1 and not ingredient.no_amount:
+                    self.food = bleach.clean(str(ingredient.food.plural_name))
+                else:
+                    self.food = bleach.clean(str(ingredient.food))
+        else:
+            self.food = ""
         self.note = bleach.clean(str(ingredient.note))
 
     def __str__(self):

cookbook/models.py

@@ -260,6 +260,7 @@ class Space(ExportModelOperationsMixin('space'), models.Model):
     max_recipes = models.IntegerField(default=0)
     max_file_storage_mb = models.IntegerField(default=0, help_text=_('Maximum file storage for space in MB. 0 for unlimited, -1 to disable file upload.'))
     max_users = models.IntegerField(default=0)
+    use_plural = models.BooleanField(default=False)
     allow_sharing = models.BooleanField(default=True)
     demo = models.BooleanField(default=False)
     food_inherit = models.ManyToManyField(FoodInheritField, blank=True)

cookbook/serializer.py

@@ -277,7 +277,8 @@ class SpaceSerializer(WritableNestedModelSerializer):
     class Meta:
         model = Space
         fields = ('id', 'name', 'created_by', 'created_at', 'message', 'max_recipes', 'max_file_storage_mb', 'max_users',
-                  'allow_sharing', 'demo', 'food_inherit', 'show_facet_count', 'user_count', 'recipe_count', 'file_size_mb', 'image',)
+                  'allow_sharing', 'demo', 'food_inherit', 'show_facet_count', 'user_count', 'recipe_count', 'file_size_mb',
+                  'image', 'use_plural',)
         read_only_fields = ('id', 'created_by', 'created_at', 'max_recipes', 'max_file_storage_mb', 'max_users', 'allow_sharing', 'demo',)
 
 

cookbook/templates/base.html

@@ -48,6 +48,9 @@
 
     <script type="text/javascript">
         $.fn.select2.defaults.set("theme", "bootstrap");
+        {% if request.user.is_authenticated %}
+        window.ACTIVE_SPACE_ID = '{{request.space.id}}';
+        {% endif %}
     </script>
 
     <!-- Fontawesome icons -->
@@ -409,6 +412,7 @@
     localStorage.setItem('STATIC_URL', "{% base_path request 'static_base' %}")
     localStorage.setItem('DEBUG', "{% is_debug %}")
     localStorage.setItem('USER_ID', "{{request.user.pk}}")
+    
     window.addEventListener("load", () => {
         if ("serviceWorker" in navigator) {
             navigator.serviceWorker.register("{% url 'service_worker' %}", {scope: "{% base_path request 'base' %}" + '/'}).then(function (reg) {