CC inspired cleanups

zgoda · Feb 6, 2019 · eaa4c3c · eaa4c3c
1 parent c85370d
commit eaa4c3c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 49 deletions.
diff --git a/brewlog/models/brewing.py b/brewlog/models/brewing.py
@@ -35,13 +35,9 @@ class Brewery(db.Model, DefaultModelMixin):
     def absolute_url(self):
         return url_for('brewery.details', brewery_id=self.id)
 
-    @property
-    def other_brewers(self):
-        return []
-
     @property
     def brewers(self):
-        return [self.brewer] + self.other_brewers
+        return [self.brewer]
 
     def _brews(self, public_only=False, limit=None, order=None):
         query = Brew.query.filter_by(brewery_id=self.id, is_draft=False)
@@ -267,9 +263,8 @@ def attenuation(self):
         return {'real': 0, 'apparent': 0}
 
     def has_access(self, user):
-        if self.brewery.brewer != user:
-            if not (self.is_public and self.brewery.has_access(user)):
-                return False
+        if self.brewery.brewer != user and not (self.is_public and self.brewery.has_access(user)):
+            return False
         return True
 
     def notes_to_json(self):
@@ -331,7 +326,9 @@ def maturing(cls, user=None, public_only=True, limit=5):
             return []
         now = datetime.datetime.utcnow()
         query = cls.query.filter(
-            Brew.bottling_date <= now, Brew.tapped.is_(None), Brew.finished.is_(None)
+            Brew.bottling_date <= now,
+            Brew.tapped.is_(None),
+            Brew.finished.is_(None)
         )
         if public_only:
             query = query.filter(Brew.is_public.is_(True))
@@ -348,7 +345,8 @@ def on_tap(cls, user=None, public_only=True, limit=5):
             return []
         now = datetime.datetime.utcnow()
         query = cls.query.filter(
-            Brew.tapped <= now, Brew.finished.is_(None)
+            Brew.tapped <= now,
+            Brew.finished.is_(None)
         )
         if public_only:
             query = query.filter(Brew.is_public.is_(True))
@@ -378,15 +376,17 @@ def get_next(self, public_only=True):
         if public_only:
             query = query.filter(Brew.is_public.is_(True))
         return query.order_by(Brew.id).filter(
-            Brew.id > self.id, Brew.brewery_id == self.brewery_id
+            Brew.id > self.id,
+            Brew.brewery_id == self.brewery_id
         ).first()
 
     def get_previous(self, public_only=True):
         query = Brew.query
         if public_only:
             query = query.filter(Brew.is_public.is_(True))
         return query.order_by(db.desc(Brew.id)).filter(
-            Brew.id < self.id, Brew.brewery_id == self.brewery_id
+            Brew.id < self.id,
+            Brew.brewery_id == self.brewery_id
         ).first()
 
 

diff --git a/brewlog/models/choices.py b/brewlog/models/choices.py
@@ -38,34 +38,3 @@
 ACTION_KEYS = ('tap', 'untap', 'finish', 'available')
 ACTION_VALUES = (_('tap'), _('untap'), _('finish'), _('available'))
 ACTION_CHOICES = list(zip(ACTION_KEYS, ACTION_VALUES))
-
-BJCP_STYLE_CODES = ('1A', '1B', '1C', '1D', '1E', '2A', '2B', '2C', '3A', '3B', '4A', '4B', '4C',
-    '5A', '5B', '5C', '5D', '6A', '6B', '6C', '6D', '7A', '7B', '7C', '8A', '8B', '8C',
-    '9A', '9B', '9C', '9D', '9E', '10A', '10B', '10C', '11A', '11B', '11C', '12A', '12B', '12C',
-    '13A', '13B', '13C', '13D', '13E', '13F', '14A', '14B', '14C', '15A', '15B', '15C', '15D',
-    '16A', '16B', '16C', '16D', '16E', '17A', '17B', '17C', '17D', '17E', '17F',
-    '18A', '18B', '18C', '18D', '18E', '19A', '19B', '19C', '20A', '21A', '21B',
-    '22A', '22B', '22C', '23A', '24A', '24B', '24C', '25A', '25B', '25C', '26A', '26B', '26C',
-    '27A', '27B', '27C', '27D', '27E', '28A', '28B', '28C', '28D')
-BJCP_STYLE_NAMES = ('Lite American Lager', 'Standard American Lager', 'Premium American Lager',
-    'Munich Helles', 'Dortmunder Export', 'German Pilsner (Pils)', 'Bohemian Pilsener', 'Classic American Pilsner',
-    'Vienna Lager', 'Oktoberfest/M\xe4rzen', 'Dark American Lager', 'Munich Dunkel',
-    'Schwarzbier (Black Beer)', 'Maibock/Helles Bock', 'Traditional Bock', 'Doppelbock', 'Eisbock',
-    'Cream Ale', 'Blonde Ale', 'K\xf6lsch', 'American Wheat or Rye Beer', 'Northern German Altbier',
-    'California Common Beer', 'D\xfcsseldorf Altbier', 'Standard/Ordinary Bitter', 'Special/Best/Premium Bitter',
-    'Extra Special/Strong Bitter (English Pale Ale)', 'Scottish Light 60/-', 'Scottish Heavy 70/-',
-    'Scottish Export 80/-', 'Irish Red Ale', 'Strong Scotch Ale', 'American Pale Ale', 'American Amber Ale',
-    'American Brown Ale', 'Mild', 'Southern English Brown', 'Northern English Brown Ale', 'Brown Porter',
-    'Robust Porter', 'Baltic Porter', 'Dry Stout', 'Sweet Stout', 'Oatmeal Stout', 'Foreign Extra Stout',
-    'American Stout', 'Russian Imperial Stout', 'English IPA', 'American IPA', 'Imperial IPA', 'Weizen/Weissbier',
-    'Dunkelweizen', 'Weizenbock', 'Roggenbier (German Rye Beer)', 'Witbier', 'Belgian Pale Ale', 'Saison',
-    'Bi\xe8re de Garde', 'Belgian Specialty Ale', 'Berliner Weisse', 'Flanders Red Ale',
-    'Flanders Brown Ale/Oud Bruin', 'Straight (Unblended) Lambic', 'Gueuze', 'Fruit Lambic',
-    'Belgian Blond Ale', 'Belgian Dubbel', 'Belgian Tripel', 'Belgian Golden Strong Ale',
-    'Belgian Dark Strong Ale', 'Old Ale', 'English Barleywine', 'American Barleywine', 'FRUIT BEER',
-    'Spice, Herb, or Vegetable Beer', 'Christmas/Winter Specialty Spiced Beer', 'Classic Rauchbier',
-    'Other Smoked Beer', 'Wood-Aged Beer', 'Specialty Beer', 'Dry Mead', 'Semi-sweet Mead', 'Sweet Mead', 'Cyser',
-    'Pyment', 'Other Fruit Melomel', 'Metheglin', 'Braggot', 'Open Category Mead', 'Common Cider ', 'English Cider ',
-    'French Cider', 'Common Perry', 'Traditional Perry ', 'New England Cider', 'Fruit Cider', 'Applewine',
-    'Other Specialty Cider/Perry')
-BJCP_STYLES = list(zip(BJCP_STYLE_CODES, BJCP_STYLE_NAMES))
diff --git a/brewlog/templates/brewery/details.html b/brewlog/templates/brewery/details.html
@@ -23,12 +23,6 @@ <h3>{{ brewery.name }}</h3>
   {% endif %}
   <h3>{{ gettext("People") }}</h3>
   <p>{{ gettext("Head brewer") }}: <a href="{{ brewery.brewer.absolute_url }}">{{ brewery.brewer.name }}</a></p>
-  {% if brewery.other_brewers %}
-  <p>{{ gettext("Other brewers") }}:</p>
-  <ul class="list-unstyled">
-    {% for brewer in brewery.other_brewers %}<li><a href="{{ brewer.absolute_url }}">{{ brewer.name }}</a></li>{% endfor %}
-  </ul>
-  {% endif %}
   {% if brewery.recent_brews() %}
   <h3>{% trans %}Latest brews{% endtrans %}</h3>
   <ul class="list-unstyled">