Browse Source

avatar fixes

devel
www-data 8 years ago
parent
commit
275b11343c
  1. 2
      accounts_app/models.py
  2. 2
      devapp/models.py
  3. 3
      djing/settings.py

2
accounts_app/models.py

@ -118,7 +118,7 @@ class UserProfile(BaseAccount):
ordering = ['fio'] ordering = ['fio']
def _thumbnail_avatar(self): 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 = Image.open(self.avatar)
im.thumbnail((200, 121), Image.ANTIALIAS) im.thumbnail((200, 121), Image.ANTIALIAS)
im.save(self.avatar.path) im.save(self.avatar.path)

2
devapp/models.py

@ -118,6 +118,8 @@ class Device(models.Model):
code = 'lzk' code = 'lzk'
elif grp == 51: elif grp == 51:
code = 'sad' code = 'sad'
elif grp == 46:
code = 'zhem'
newmac = str(self.mac_addr) newmac = str(self.mac_addr)
run(["%s/devapp/onu_register.sh" % settings.BASE_DIR, newmac, code]) run(["%s/devapp/onu_register.sh" % settings.BASE_DIR, newmac, code])

3
djing/settings.py

@ -152,8 +152,7 @@ if DEBUG:
DATE_FORMAT = 'd E Y' DATE_FORMAT = 'd E Y'
MEDIA_URL = '/media/' 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' DEFAULT_PICTURE = '/static/img/user_ava.gif'
AUTH_USER_MODEL = 'accounts_app.UserProfile' AUTH_USER_MODEL = 'accounts_app.UserProfile'

Loading…
Cancel
Save