Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Allow admin restrict chart dbs #5837

Closed
wants to merge 2 commits into from
Closed

[WIP] Allow admin restrict chart dbs #5837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6006a19
quote hive column names (#5368)
timifasubaa Jul 13, 2018
6e23a42
add allow charts to restrict users from visualizing data from smoe da…
timifasubaa Sep 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions superset/migrations/versions/6400c588de5e_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
"""empty message

Revision ID: 6400c588de5e
Revises: bddc498dd179
Create Date: 2018-07-13 17:10:00.156708

"""

# revision identifiers, used by Alembic.
revision = '6400c588de5e'
down_revision = 'bddc498dd179'

from alembic import op
import sqlalchemy as sa


def upgrade():
op.add_column('dbs', sa.Column('allow_csv_upload', sa.Boolean(), nullable=True))

def downgrade():
op.drop_column('dbs', 'allow_csv_upload')
31 changes: 31 additions & 0 deletions superset/migrations/versions/af91471628d4_add_allow_charts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
"""empty message

Revision ID: af91471628d4
Revises: 55e910a74826
Create Date: 2018-09-06 02:04:06.340732

"""

# revision identifiers, used by Alembic.
revision = 'af91471628d4'
down_revision = '55e910a74826'

from alembic import op
import sqlalchemy as sa


from sqlalchemy.sql import expression


def upgrade():
op.add_column(
'dbs',
sa.Column(
'allow_charts',
sa.Boolean(),
nullable=False,
server_default=expression.true()))

def downgrade():
op.drop_column('dbs', 'allow_charts')

3 changes: 2 additions & 1 deletion superset/models/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,7 @@ class Database(Model, AuditMixinNullable, ImportMixin):
expose_in_sqllab = Column(Boolean, default=False)
allow_run_sync = Column(Boolean, default=True)
allow_run_async = Column(Boolean, default=False)
allow_charts = Column(Boolean, default=True)
allow_csv_upload = Column(Boolean, default=True)
allow_ctas = Column(Boolean, default=False)
allow_dml = Column(Boolean, default=False)
Expand All @@ -654,7 +655,7 @@ class Database(Model, AuditMixinNullable, ImportMixin):
impersonate_user = Column(Boolean, default=False)
export_fields = ('database_name', 'sqlalchemy_uri', 'cache_timeout',
'expose_in_sqllab', 'allow_run_sync', 'allow_run_async',
'allow_ctas', 'allow_csv_upload', 'extra')
'allow_ctas', 'allow_charts', 'allow_csv_upload', 'extra')
export_children = ['tables']

def __repr__(self):
Expand Down
15 changes: 8 additions & 7 deletions superset/views/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,16 +148,16 @@ class DatabaseView(SupersetModelView, DeleteMixin, YamlExportMixin): # noqa

list_columns = [
'database_name', 'backend', 'allow_run_sync', 'allow_run_async',
'allow_dml', 'allow_csv_upload', 'creator', 'modified']
'allow_dml', 'allow_charts', 'allow_csv_upload', 'creator', 'modified']
order_columns = [
'database_name', 'allow_run_sync', 'allow_run_async', 'allow_dml',
'modified', 'allow_csv_upload',
'modified', 'allow_charts', 'allow_csv_upload',
]
add_columns = [
'database_name', 'sqlalchemy_uri', 'cache_timeout', 'extra',
'expose_in_sqllab', 'allow_run_sync', 'allow_run_async', 'allow_csv_upload',
'allow_ctas', 'allow_dml', 'force_ctas_schema', 'impersonate_user',
'allow_multi_schema_metadata_fetch',
'expose_in_sqllab', 'allow_run_sync', 'allow_run_async', 'allow_charts',
'allow_csv_upload', 'allow_ctas', 'allow_dml', 'force_ctas_schema',
'impersonate_user', 'allow_multi_schema_metadata_fetch',
]
search_exclude_columns = (
'password', 'tables', 'created_by', 'changed_by', 'queries',
Expand Down Expand Up @@ -240,6 +240,7 @@ class DatabaseView(SupersetModelView, DeleteMixin, YamlExportMixin): # noqa
'allow_run_sync': _('Allow Run Sync'),
'allow_run_async': _('Allow Run Async'),
'impersonate_user': _('Impersonate the logged on user'),
'allow_charts': _('Allow users make charts backed by this db'),
'allow_csv_upload': _('Allow Csv Upload'),
'modified': _('Modified'),
'allow_multi_schema_metadata_fetch': _('Allow Multi Schema Metadata Fetch'),
Expand Down Expand Up @@ -292,8 +293,8 @@ class DatabaseAsync(DatabaseView):
'id', 'database_name',
'expose_in_sqllab', 'allow_ctas', 'force_ctas_schema',
'allow_run_async', 'allow_run_sync', 'allow_dml',
'allow_multi_schema_metadata_fetch', 'allow_csv_upload',
'allows_subquery',
'allow_multi_schema_metadata_fetch', 'allow_charts',
'allow_csv_upload', 'allows_subquery',
]


Expand Down