From 772ea94b59f697808c85031b132a8009b3161fd6 Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Tue, 13 May 2014 16:47:58 +0300 Subject: [PATCH] Fix: move the groups creation to init function --- manage.py | 3 ++- redash/models.py | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manage.py b/manage.py index 2854c11b6..a55cc807c 100755 --- a/manage.py +++ b/manage.py @@ -66,9 +66,10 @@ def check_settings(): @database_manager.command def create_tables(): """Creates the database tables.""" - from redash.models import create_db + from redash.models import create_db, init_db create_db(True, False) + init_db() @database_manager.command def drop_tables(): diff --git a/redash/models.py b/redash/models.py index e8e28edfe..6f23ea5b1 100644 --- a/redash/models.py +++ b/redash/models.py @@ -399,6 +399,10 @@ class Widget(BaseModel): all_models = (DataSource, User, QueryResult, Query, Dashboard, Visualization, Widget, ActivityLog, Group) +def init_db(): + Group.insert(name='admin', permissions=['admin'], tables=['*']).execute() + Group.insert(name='api', permissions=['view_query'], tables=['*']).execute() + Group.insert(name='default', permissions=Group.DEFAULT_PERMISSIONS, tables=['*']).execute() def create_db(create_tables, drop_tables): db.connect_db() @@ -412,9 +416,4 @@ def create_db(create_tables, drop_tables): if create_tables and not model.table_exists(): model.create_table() - - Group.insert(name='admin', permissions=['admin'], tables=['*']).execute() - Group.insert(name='api', permissions=['view_query'], tables=['*']).execute() - Group.insert(name='default', permissions=Group.DEFAULT_PERMISSIONS, tables=['*']).execute() - db.close_db(None) \ No newline at end of file