From 01e21e100d188af83531ae397c54d7fdc868d611 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sat, 23 Jan 2021 13:02:43 -0600 Subject: [PATCH] Move initial post values into pgwui_upload_core --- src/pgwui_bulk_upload/views/bulk_upload.py | 27 ++++------------------ 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/src/pgwui_bulk_upload/views/bulk_upload.py b/src/pgwui_bulk_upload/views/bulk_upload.py index 0158916..a6b7445 100644 --- a/src/pgwui_bulk_upload/views/bulk_upload.py +++ b/src/pgwui_bulk_upload/views/bulk_upload.py @@ -35,7 +35,6 @@ from pgwui_common.view import auth_base_view import pgwui_core.exceptions as core_ex from pgwui_core.core import ( - UploadNullFileInitialPost, UploadNullFileWTForm, UploadEngine, ParameterExecutor, @@ -48,6 +47,7 @@ from pgwui_core.core import ( ) from pgwui_upload_core.views.upload import ( BaseTableUploadHandler, + UploadCoreInitialPost, set_upload_response, ) @@ -67,27 +67,6 @@ def archive_path(path): return os.path.join(*[os.fsdecode(part) for part in path.parts[-2:]]) -@attr.s -class BulkUploadInitialPost(UploadNullFileInitialPost): - '''Get values from settings for when there's not user-supplied - values in POST - ''' - def build(self, settings={}): - super().build(settings) - bulk_settings = settings['pgwui']['pgwui_bulk_upload'] - self.trim_upload = ( - bulk_settings['trim'] == 'choice-yes') - self.literal_col_headings = ( - bulk_settings['literal_column_headings'] == 'yes') - return self - - -class BulkUploadFileWTForm(UploadNullFileWTForm): - '''Use the appropriate initial values when there's no POST data - ''' - ivals = BulkUploadInitialPost - - class BulkUploadForm(UploadNullMixin, UploadDoubleFileForm): ''' Acts like a dict, but with extra methods. @@ -465,7 +444,9 @@ class BulkTableUploadHandler(BaseTableUploadHandler): ''' Make the upload form needed by this handler. ''' - return BulkUploadForm(self, fc=BulkUploadFileWTForm) + return BulkUploadForm().build( + self, fc=UploadNullFileWTForm, + ip=UploadCoreInitialPost().set_component('pgwui_bulk_upload')) def get_data(self): ''' -- 2.34.1