0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

check data is a dict

Browse source
This commit is contained in:
j 2016-02-19 18:46:53 +05:30
parent 6b1ce30eb2
commit d241b90b63
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/archive/views.py
View file

@ -210,7 +210,7 @@ def addMedia(request, data):
else: else:
extension = 'webm' extension = 'webm'
f.selected = True f.selected = True
if 'info' in data and data['info']: if 'info' in data and data['info'] and isinstance(data['info'], dict):
f.info = data['info'] f.info = data['info']
f.info['extension'] = extension f.info['extension'] = extension
f.parse_info() f.parse_info()

2
pandora/edit/models.py
View file

@ -191,7 +191,7 @@ class Edit(models.Model):
self.rightslevel = int(data['rightslevel']) self.rightslevel = int(data['rightslevel'])
if key == 'query' and not data['query']: if key == 'query' and not data['query']:
setattr(self, key, {"static":True}) setattr(self, key, {"static":True})
elif key == 'query': elif key == 'query' and isinstance(data[key], dict):
setattr(self, key, data[key]) setattr(self, key, data[key])
if 'position' in data: if 'position' in data:

2
pandora/itemlist/models.py
View file

@ -116,7 +116,7 @@ class List(models.Model):
for key in data: for key in data:
if key == 'query' and not data['query']: if key == 'query' and not data['query']:
setattr(self, key, {"static":True}) setattr(self, key, {"static":True})
elif key == 'query': elif key == 'query' and isinstance(data[key], dict):
setattr(self, key, data[key]) setattr(self, key, data[key])
elif key == 'type': elif key == 'type':
if data[key] == 'static': if data[key] == 'static':

4
pandora/user/models.py
View file

@ -116,7 +116,9 @@ class SessionData(models.Model):
if data.ip.startswith('::ffff:'): if data.ip.startswith('::ffff:'):
data.ip = data.ip[len('::ffff:'):] data.ip = data.ip[len('::ffff:'):]
data.useragent = request.META.get('HTTP_USER_AGENT', '')[:4096] data.useragent = request.META.get('HTTP_USER_AGENT', '')[:4096]
data.info = json.loads(request.POST.get('data', '{}')) info = json.loads(request.POST.get('data', '{}'))
if info and isinstance(info, dict):
data.info = info
screen = data.info.get('screen', {}) screen = data.info.get('screen', {})
if screen and 'height' in screen and 'width' in screen: if screen and 'height' in screen and 'width' in screen:
data.screensize = u'%s\xd7%s' % (screen['width'], screen['height']) data.screensize = u'%s\xd7%s' % (screen['width'], screen['height'])