From 4d546c75613c383616158927982cc480d842e039 Mon Sep 17 00:00:00 2001 From: John Bodley Date: Tue, 25 Oct 2022 16:49:35 -0700 Subject: [PATCH] chore: Refactor ownership --- superset/datasets/api.py | 4 ++-- superset/datasets/commands/duplicate.py | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/superset/datasets/api.py b/superset/datasets/api.py index e9d7e7f32f9d..069268a42871 100644 --- a/superset/datasets/api.py +++ b/superset/datasets/api.py @@ -22,7 +22,7 @@ from zipfile import is_zipfile, ZipFile import yaml -from flask import g, request, Response, send_file +from flask import request, Response, send_file from flask_appbuilder.api import expose, protect, rison, safe from flask_appbuilder.models.sqla.interface import SQLAInterface from flask_babel import ngettext @@ -585,7 +585,7 @@ def duplicate(self) -> Response: return self.response_400(message=error.messages) try: - new_model = DuplicateDatasetCommand([g.user.id], item).run() + new_model = DuplicateDatasetCommand(item).run() return self.response(201, id=new_model.id, result=item) except DatasetInvalidError as ex: return self.response_422( diff --git a/superset/datasets/commands/duplicate.py b/superset/datasets/commands/duplicate.py index 3ee538230b68..355cba7fc3ee 100644 --- a/superset/datasets/commands/duplicate.py +++ b/superset/datasets/commands/duplicate.py @@ -18,7 +18,6 @@ from typing import Any, Dict, List from flask_appbuilder.models.sqla import Model -from flask_appbuilder.security.sqla.models import User from flask_babel import gettext as __ from marshmallow import ValidationError from sqlalchemy.exc import SQLAlchemyError @@ -44,8 +43,7 @@ class DuplicateDatasetCommand(CreateMixin, BaseCommand): - def __init__(self, user: User, data: Dict[str, Any]): - self._actor = user + def __init__(self, data: Dict[str, Any]) -> None: self._base_model: SqlaTable = SqlaTable() self._properties = data.copy() @@ -122,7 +120,7 @@ def validate(self) -> None: exceptions.append(DatasetExistsValidationError(table_name=duplicate_name)) try: - owners = self.populate_owners(self._actor) + owners = self.populate_owners() self._properties["owners"] = owners except ValidationError as ex: exceptions.append(ex)