add support to define more than one treating group

This commit is contained in:
Frédéric Péters 2018-04-26 10:54:53 +02:00
parent 10c1e51790
commit 511ce809af
2 changed files with 13 additions and 6 deletions

View File

@ -28,9 +28,12 @@ class IImportFileFormSchema(form.Schema):
portal_type = schema.Text(required=False)
location = schema.Text(required=False)
owner = schema.Text(required=False)
treating_group = schema.Text(required=False)
treating_groups = schema.Text(required=False) # new, comme separated identifiers
keywords = schema.Text(required=False) # comma separated identifiers
# legacy
treating_group = schema.Text(required=False)
class ImportFileForm(form.SchemaForm):
schema = IImportFileFormSchema
@ -71,14 +74,18 @@ class ImportFileForm(form.SchemaForm):
portal_type = data['portal_type']
filename = data['file'].filename
owner = data['owner']
treating_group = data['treating_group']
if data['treating_group']: # legacy
treating_groups = set([data['treating_group']])
else:
treating_groups = set([x.strip() for x in (data['treating_groups'] or '').split(',')])
folder = self.get_folder(data['location'])
keywords = set([x.strip() for x in (data['keywords'] or '').split(',')])
document_id = self.convertTitleToId(data.get('title') or os.path.splitext(filename)[0])
utils.createDocument(self, folder, portal_type, document_id,
filename, data['file'], owner, treating_group=treating_group,
filename, data['file'], owner, treating_groups=treating_groups,
metadata={
'title': data.get('title'),
'keywords': keywords,

View File

@ -21,7 +21,7 @@ log = logging.getLogger('collective.dms.batchimport')
def createDocument(context, folder, portal_type, document_id, filename,
file_object, owner=None, treating_group=None, metadata=None):
file_object, owner=None, treating_groups=None, metadata=None):
if owner is None:
owner = api.user.get_current().id
@ -47,11 +47,11 @@ def createDocument(context, folder, portal_type, document_id, filename,
if IDeadline and IDeadline.providedBy(document):
document.deadline = deadlineDefaultValue(None)
if treating_group:
if treating_groups:
canwrite_dm = LocalRolesToPrincipalsDataManager(document,
IDmsDocument['treating_groups'])
canwrite_dm.set([])
canwrite_dm.set([treating_group])
canwrite_dm.set(list(treating_groups))
document.reindexObjectSecurity()
version = createContentInContainer(document, 'dmsmainfile',