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

use from/toAZ

Browse source
This commit is contained in:
j 2011-12-18 15:05:49 +05:30
commit cea86aee43
17 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pandora/user/models.py
View file

@ -122,7 +122,7 @@ class SessionData(models.Model):
return data
def get_id(self):
return self.user and ox.to26(self.user.id) or self.session_key
return self.user and ox.toAZ(self.user.id) or self.session_key
def json(self, keys=None, user=None):
j = {
@ -276,7 +276,7 @@ def user_json(user, keys=None):
'disabled': not user.is_active,
'email': user.email,
'firstseen': user.date_joined,
'id': ox.to26(user.id),
'id': ox.toAZ(user.id),
'lastseen': user.last_login,
'level': p.get_level(),
'newsletter': p.newsletter,

6
pandora/user/views.py
View file

@ -267,8 +267,8 @@ def requestToken(request):
user = None
if user:
while True:
code = ox.to26(random.randint(ox.from26('BAAAAAAAAAAAAAAA'),
ox.from26('BAAAAAAAAAAAAAAAA')))
code = ox.toAZ(random.randint(ox.fromAZ('AAAAAAAAAAAAAAAA'),
ox.fromAZ('AAAAAAAAAAAAAAAAA')))
if models.UserProfile.objects.filter(reset_code=code).count() == 0:
break
user_profile = user.get_profile()
@ -320,7 +320,7 @@ def editUser(request):
'''
response = json_response()
data = json.loads(request.POST['data'])
user = get_object_or_404_json(models.User, pk=ox.from26(data['id']))
user = get_object_or_404_json(models.User, pk=ox.fromAZ(data['id']))
profile = user.get_profile()
if 'disabled' in data:
user.is_active = not data['disabled']