Merge pull request #1297 from myrix/heavy_refactor

Create organization permission bug #439
ispras · Mar 3, 2021 · 8f97a0b · 8f97a0b
2 parents 8e51329 + 11a87c0
commit 8f97a0b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/lingvodoc/views/v2/phonology.py b/lingvodoc/views/v2/phonology.py
@@ -3066,7 +3066,7 @@ def analyze_sound_markup(
 
         log.debug(message('\n  blob description: {0}/{1}'.format(
             row.Markup.additional_metadata['blob_description'],
-            row.Sound.additional_metadata['blob_description'])))
+            row.Sound.additional_metadata.get('blob_description'))))
 
     # Checking if we have cached result for this pair of sound/markup.
     #

diff --git a/lingvodoc/views/v2/user_and_login.py b/lingvodoc/views/v2/user_and_login.py
@@ -78,7 +78,6 @@ def new_user(login, name, email, password, year, month, day):
     basegroups = []
     basegroups += [DBSession.query(BaseGroup).filter_by(name="Can create dictionaries").first()]
     basegroups += [DBSession.query(BaseGroup).filter_by(name="Can create languages").first()]
-    basegroups += [DBSession.query(BaseGroup).filter_by(name="Can create organizations").first()]
     basegroups += [DBSession.query(BaseGroup).filter_by(name="Can create translation strings").first()]
 
     groups = []