##// END OF EJS Templates
Changed db_manage functions to use new User model create method
marcink -
r1503:b02aa5f2 beta
parent child Browse files
Show More
@@ -411,42 +411,30 b' class DbManage(object):'
411
411
412 def create_user(self, username, password, email='', admin=False):
412 def create_user(self, username, password, email='', admin=False):
413 log.info('creating administrator user %s', username)
413 log.info('creating administrator user %s', username)
414 new_user = User()
414
415 new_user.username = username
415 form_data = dict(username=username,
416 new_user.password = get_crypt_password(password)
416 password=password,
417 new_user.api_key = generate_api_key(username)
417 active=True,
418 new_user.name = 'RhodeCode'
418 admin=admin,
419 new_user.lastname = 'Admin'
419 name='RhodeCode',
420 new_user.email = email
420 lastname='Admin',
421 new_user.admin = admin
421 email=email)
422 new_user.active = True
422 User.create(form_data)
423
423
424 try:
425 self.sa.add(new_user)
426 self.sa.commit()
427 except:
428 self.sa.rollback()
429 raise
430
424
431 def create_default_user(self):
425 def create_default_user(self):
432 log.info('creating default user')
426 log.info('creating default user')
433 #create default user for handling default permissions.
427 #create default user for handling default permissions.
434 def_user = User()
435 def_user.username = 'default'
436 def_user.password = get_crypt_password(str(uuid.uuid1())[:8])
437 def_user.api_key = generate_api_key('default')
438 def_user.name = 'Anonymous'
439 def_user.lastname = 'User'
440 def_user.email = 'anonymous@rhodecode.org'
441 def_user.admin = False
442 def_user.active = False
443 try:
444 self.sa.add(def_user)
445 self.sa.commit()
446 except:
447 self.sa.rollback()
448 raise
449
428
429 form_data = dict(username='default',
430 password=str(uuid.uuid1())[:8],
431 active=False,
432 admin=False,
433 name='Anonymous',
434 lastname='User',
435 email='anonymous@rhodecode.org')
436 User.create(form_data)
437
450 def create_permissions(self):
438 def create_permissions(self):
451 #module.(access|create|change|delete)_[name]
439 #module.(access|create|change|delete)_[name]
452 #module.(read|write|owner)
440 #module.(read|write|owner)
General Comments 0
You need to be logged in to leave comments. Login now