diff --git a/files/routes/admin.py b/files/routes/admin.py index 2103039d46..d8771db8cd 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -400,10 +400,7 @@ def badge_grant_post(v): """ send_notification(NOTIFICATIONS_ACCOUNT, user, text) - if badge_id == 16 and user.has_badge(17): - g.db.query(Badge).options(lazyload('*')).filter_by(badge_id=17, user_id=user.id).delete() - - elif badge_id in [21,22,23,24,25,28]: + if badge_id in [21,22,23,24,25,28]: user.patron = int(str(badge_id)[-1]) grant_awards = {} diff --git a/files/routes/login.py b/files/routes/login.py index cd1b9a8e82..3284bfb68e 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -328,9 +328,6 @@ def sign_up_post(v): if not ref_user.has_badge(badge.id): new_badge = Badge(user_id=ref_user.id, badge_id=badge.id) g.db.add(new_badge) - else: - bad_badge = ref_user.has_badge(badge.id) - if bad_badge: g.db.delete(bad_badge) g.db.add(ref_user)