From: Karl O. Pinc Date: Tue, 13 Aug 2024 17:07:09 +0000 (-0500) Subject: Have a separate module for forms X-Git-Url: https://papio.biology.duke.edu/gitweb/?a=commitdiff_plain;h=e1199566f2576327f5fff1b5ee9b8e8e186df5ee;p=pgwui_bulk_upload Have a separate module for forms --- diff --git a/src/pgwui_bulk_upload/views/bulk_upload.py b/src/pgwui_bulk_upload/views/bulk_upload.py index 9269330..2075541 100644 --- a/src/pgwui_bulk_upload/views/bulk_upload.py +++ b/src/pgwui_bulk_upload/views/bulk_upload.py @@ -32,15 +32,13 @@ import yaml from pgwui_common.view import auth_base_view import pgwui_core.exceptions as core_ex +import pgwui_core.forms import pgwui_core.utils from pgwui_core.core import ( - UploadNullFileWTForm, UploadEngine, ParameterExecutor, DataLineProcessor, - UploadNullMixin, - UploadDoubleFileForm, UploadData, ) from pgwui_upload_core.views.upload import ( @@ -66,7 +64,8 @@ def archive_path(path): return os.path.join(*[os.fsdecode(part) for part in path.parts[-2:]]) -class BulkUploadForm(UploadNullMixin, UploadDoubleFileForm): +class BulkUploadForm(pgwui_core.forms.UploadNullMixin, + pgwui_core.forms.UploadDoubleFileForm): ''' Acts like a dict, but with extra methods. @@ -484,7 +483,7 @@ class BulkTableUploadHandler(BaseTableUploadHandler): Make the upload form needed by this handler. ''' return BulkUploadForm().build( - self, fc=UploadNullFileWTForm, + self, fc=pgwui_core.forms.UploadNullFileWTForm, ip=UploadCoreInitialPost().set_component('pgwui_bulk_upload')) def get_data(self):