diff --git a/accounts_app/models.py b/accounts_app/models.py index 3a081a0..cf1e085 100644 --- a/accounts_app/models.py +++ b/accounts_app/models.py @@ -118,7 +118,7 @@ class UserProfile(BaseAccount): ordering = ['fio'] def _thumbnail_avatar(self): - if os.path.isfile(self.avatar.path): + if self.avatar and os.path.isfile(self.avatar.path): im = Image.open(self.avatar) im.thumbnail((200, 121), Image.ANTIALIAS) im.save(self.avatar.path) diff --git a/devapp/models.py b/devapp/models.py index 425a1b3..8b4a35e 100644 --- a/devapp/models.py +++ b/devapp/models.py @@ -118,6 +118,8 @@ class Device(models.Model): code = 'lzk' elif grp == 51: code = 'sad' + elif grp == 46: + code = 'zhem' newmac = str(self.mac_addr) run(["%s/devapp/onu_register.sh" % settings.BASE_DIR, newmac, code]) diff --git a/djing/settings.py b/djing/settings.py index 19726df..65f3a67 100644 --- a/djing/settings.py +++ b/djing/settings.py @@ -152,8 +152,7 @@ if DEBUG: DATE_FORMAT = 'd E Y' MEDIA_URL = '/media/' -if DEBUG: - MEDIA_ROOT = os.path.join(BASE_DIR, 'media') +MEDIA_ROOT = os.path.join(BASE_DIR, 'media') DEFAULT_PICTURE = '/static/img/user_ava.gif' AUTH_USER_MODEL = 'accounts_app.UserProfile'