##// 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,41 +411,29 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()
415 new_user.username = username
416 new_user.password = get_crypt_password(password)
417 new_user.api_key = generate_api_key(username)
418 new_user.name = 'RhodeCode'
419 new_user.lastname = 'Admin'
420 new_user.email = email
421 new_user.admin = admin
422 new_user.active = True
423
414
424 try:
415 form_data = dict(username=username,
425 self.sa.add(new_user)
416 password=password,
426 self.sa.commit()
417 active=True,
427 except:
418 admin=admin,
428 self.sa.rollback()
419 name='RhodeCode',
429 raise
420 lastname='Admin',
421 email=email)
422 User.create(form_data)
423
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()
428
435 def_user.username = 'default'
429 form_data = dict(username='default',
436 def_user.password = get_crypt_password(str(uuid.uuid1())[:8])
430 password=str(uuid.uuid1())[:8],
437 def_user.api_key = generate_api_key('default')
431 active=False,
438 def_user.name = 'Anonymous'
432 admin=False,
439 def_user.lastname = 'User'
433 name='Anonymous',
440 def_user.email = 'anonymous@rhodecode.org'
434 lastname='User',
441 def_user.admin = False
435 email='anonymous@rhodecode.org')
442 def_user.active = False
436 User.create(form_data)
443 try:
444 self.sa.add(def_user)
445 self.sa.commit()
446 except:
447 self.sa.rollback()
448 raise
449
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]
General Comments 0
You need to be logged in to leave comments. Login now