mirror of
https://github.com/getredash/redash.git
synced 2025-12-19 17:37:19 -05:00
Make sure when users are created that it is with the default groups and not permissions.
This commit is contained in:
@@ -60,7 +60,7 @@ def drop_tables():
|
|||||||
@users_manager.option('--admin', dest='is_admin', action="store_true", default=False, help="set user as admin")
|
@users_manager.option('--admin', dest='is_admin', action="store_true", default=False, help="set user as admin")
|
||||||
@users_manager.option('--google', dest='google_auth', action="store_true", default=False, help="user uses Google Auth to login")
|
@users_manager.option('--google', dest='google_auth', action="store_true", default=False, help="user uses Google Auth to login")
|
||||||
@users_manager.option('--password', dest='password', default=None, help="Password for users who don't use Google Auth (leave blank for prompt).")
|
@users_manager.option('--password', dest='password', default=None, help="Password for users who don't use Google Auth (leave blank for prompt).")
|
||||||
@users_manager.option('--groups', dest='groups', default=models.Group.DEFAULT_PERMISSIONS, help="Comma seperated list of groups (leave blank for default).")
|
@users_manager.option('--groups', dest='groups', default=models.User.DEFAULT_GROUPS, help="Comma seperated list of groups (leave blank for default).")
|
||||||
def create(email, name, groups, is_admin=False, google_auth=False, password=None):
|
def create(email, name, groups, is_admin=False, google_auth=False, password=None):
|
||||||
print "Creating user (%s, %s)..." % (email, name)
|
print "Creating user (%s, %s)..." % (email, name)
|
||||||
print "Admin: %r" % is_admin
|
print "Admin: %r" % is_admin
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ def create_and_login_user(app, user):
|
|||||||
user_object.save()
|
user_object.save()
|
||||||
except models.User.DoesNotExist:
|
except models.User.DoesNotExist:
|
||||||
logger.debug("Creating user object (%r)", user.name)
|
logger.debug("Creating user object (%r)", user.name)
|
||||||
user_object = models.User.create(name=user.name, email=user.email, groups = ['default'])
|
user_object = models.User.create(name=user.name, email=user.email, groups = models.User.DEFAULT_GROUPS)
|
||||||
|
|
||||||
login_user(user_object, remember=True)
|
login_user(user_object, remember=True)
|
||||||
|
|
||||||
|
|||||||
@@ -102,11 +102,13 @@ class Group(BaseModel):
|
|||||||
|
|
||||||
|
|
||||||
class User(BaseModel, UserMixin):
|
class User(BaseModel, UserMixin):
|
||||||
|
DEFAULT_GROUPS = ['default']
|
||||||
|
|
||||||
id = peewee.PrimaryKeyField()
|
id = peewee.PrimaryKeyField()
|
||||||
name = peewee.CharField(max_length=320)
|
name = peewee.CharField(max_length=320)
|
||||||
email = peewee.CharField(max_length=320, index=True, unique=True)
|
email = peewee.CharField(max_length=320, index=True, unique=True)
|
||||||
password_hash = peewee.CharField(max_length=128, null=True)
|
password_hash = peewee.CharField(max_length=128, null=True)
|
||||||
groups = ArrayField(peewee.CharField, default=['default'])
|
groups = ArrayField(peewee.CharField, default=DEFAULT_GROUPS)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
db_table = 'users'
|
db_table = 'users'
|
||||||
|
|||||||
Reference in New Issue
Block a user