Skip to content

Commit

Permalink
Merge f722772 into 31d1fe0
Browse files Browse the repository at this point in the history
  • Loading branch information
reinhardt committed Mar 3, 2015
2 parents 31d1fe0 + f722772 commit f636196
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
<a href="@@add_folder" tal:attributes="href string:${context/absolute_url}/add_folder" class="button create-folder pat-modal icon-folder" data-pat-modal="class: large">Create folder</a>
</div>
<form action="./">
<fieldset class="pat-upload" data-pat-upload="url: https://example.org/upload; label: Drop files here or click to browse…; trigger: auto;">
<fieldset class="pat-upload" data-pat-upload="url: fileUpload; label: Drop files here or click to browse…; trigger: auto;" tal:attributes="data-pat-upload string:url: ${context/absolute_url}/fileUpload;; label: Drop files here or click to browse…;; trigger: auto;">
<label class="accessibility-options">
<input type="file" multiple> Upload files
</label>
Expand Down
9 changes: 9 additions & 0 deletions src/ploneintranet/workspace/workspacecontainer.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,12 @@ class WorkspaceContainer(Container):
A folder to contain WorkspaceFolders
"""
grok.implements(IWorkspaceContainer)

try:
from ploneintranet.attachments.attachments import IAttachmentStoragable
except ImportError:
IAttachmentStoragable = None

if IAttachmentStoragable is not None:
from zope import interface
interface.classImplements(WorkspaceContainer, IAttachmentStoragable)

0 comments on commit f636196

Please sign in to comment.