0001-misc-accept-non-local-storage-as-attachments-in-evol.patch

Thomas Noël, 15 octobre 2020 12:39

Voir les différences: en ligne côte à côte

Subject: [PATCH] misc: accept non-local storage as attachments in evolution
 (#47704)

 wcs/qommon/upload_storage.py |  2 +-
 wcs/wf/attachment.py         |  5 +--
 wcs/workflows.py             | 63 ++++++++++++++++++++++++------------
 3 files changed, 47 insertions(+), 23 deletions(-)

         def get_file_pointer(self):
             if 'fp' in self.__dict__ and self.__dict__.get('fp') is not None:
                 return self.__dict__.get('fp')
             elif hasattr(self, 'qfilename'):
             elif getattr(self, 'qfilename', None):
                 basedir = os.path.join(get_publisher().app_dir, 'uploads')
                 self.fp = open(os.path.join(basedir, self.qfilename), 'rb')
                 return self.fp

                     if not isinstance(p, AttachmentEvolutionPart):
                         continue
                     if os.path.basename(p.filename) == fn:
                         return redirect( '%sfiles/attachment-%s/%s' % (
                                 self.filled.get_url(), fn, urllib.quote(p.base_filename)))
                         is_in_backoffice = bool(get_request() and get_request().is_in_backoffice())
                         return redirect('%sfiles/attachment-%s/%s' % (
                                 self.filled.get_url(backoffice=is_in_backoffice), fn, urllib.quote(p.base_filename)))
         raise TraversalError()

     from quixote.html import htmltext
     from .qommon import errors
     from .qommon.template import Template, TemplateError
     from .qommon.upload_storage import PicklableUpload, get_storage_object
     from .conditions import Condition
     from .roles import Role, logged_users_role, get_user_roles
-...
         @property
         def content(self):
             return self.attachment_evolution_part.get_file_pointer().read()
             fp = self.attachment_evolution_part.get_file_pointer()
             if fp:
                 return fp.read()
             return b''
         @property
         def b64_content(self):
-...
         content_type = None
         charset = None
         varname = None
         storage = None
         storage_attrs = None
         def __init__(self, base_filename, fp, orig_filename=None, content_type=None,
                 charset=None, varname=None):
                 charset=None, varname=None, storage=None, storage_attrs=None):
             self.base_filename = base_filename
             self.orig_filename = orig_filename or base_filename
             self.content_type = content_type
             self.charset = charset
             self.fp = fp
             self.varname = varname
             self.storage = storage
             self.storage_attrs = storage_attrs
         @classmethod
         def from_upload(cls, upload, varname=None):
             return AttachmentEvolutionPart(
                     upload.base_filename,
                     upload.fp,
                     getattr(upload, 'fp', None),
                     upload.orig_filename,
                     upload.content_type,
                     upload.charset,
                     varname=varname)
                     varname=varname,
                     storage=getattr(upload, 'storage', None),
                     storage_attrs=getattr(upload, 'storage_attrs', None))
         def get_file_pointer(self):
             return open(self.filename, 'rb')
         def __getstate__(self):
             odict = self.__dict__.copy()
             if not 'fp' in odict:
             if not odict.get('fp'):
                 if 'filename' not in odict:
                     # we need a filename as an identifier: create one from nothing
                     # instead of file_digest(self.fp) (see below)
                     odict['filename'] = str(uuid.uuid4())
                     self.filename = odict['filename']
                 return odict
             del odict['fp']
-...
             return odict
         def view(self):
             return htmltext('<p class="wf-attachment"><a href="attachment?f=%s">%s</a>' % (
                         os.path.basename(self.filename), self.orig_filename))
             show_link = True
             if self.has_redirect_url():
                 is_in_backoffice = bool(get_request() and get_request().is_in_backoffice())
                 show_link = bool(self.get_redirect_url(backoffice=is_in_backoffice))
             if show_link:
                 return htmltext('<p class="wf-attachment"><a href="attachment?f=%s">%s</a></p>' % (
                             os.path.basename(self.filename), self.orig_filename))
             else:
                 return htmltext('<p class="wf-attachment">%s</p>' % self.orig_filename)
         @classmethod
         def get_substitution_variables(cls, formdata):
-...
         # mimic PicklableUpload methods:
         def can_thumbnail(self):
             return True
             return get_storage_object(getattr(self, 'storage', None)).can_thumbnail(self)
         def has_redirect_url(self):
             return False
             return get_storage_object(getattr(self, 'storage', None)).has_redirect_url(self)
         def get_redirect_url(self, upload, backoffice=False):
             # should never be called, has_redirect_url is False
             raise AssertionError('no get_redirect_url on AttachmentEvolutionPart object')
         def get_redirect_url(self, backoffice=False):
             return get_storage_object(getattr(self, 'storage', None)).get_redirect_url(self,
                     backoffice=backoffice)
     class DuplicateGlobalActionNameError(Exception):
-...
                     if not picklableupload:
                         continue
                     try:
                         # convert any value to a PicklableUpload; it will ususally
                         # be a dict like one provided by qommon/evalutils:attachment()
                         picklableupload = FileField.convert_value_from_anything(picklableupload)
                     except ValueError:
                         get_publisher().notify_of_exception(sys.exc_info(),
                                                             context='[workflow/attachments]')
                         continue
                     if not isinstance(picklableupload, PicklableUpload):
                         try:
                             # convert any value to a PicklableUpload; it will ususally
                             # be a dict like one provided by qommon/evalutils:attachment()
                             picklableupload = FileField.convert_value_from_anything(picklableupload)
                         except ValueError:
                             get_publisher().notify_of_exception(sys.exc_info(),
                                                                 context='[workflow/attachments]')
                             continue
                     uploads.append(picklableupload)
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-misc-accept-non-local-storage-as-attachments-in-evol.patch