[Testbot] Plone 5.0 - Python 2.7 - Build # 2787 - Regression! - 0 failure(s)
jenkins at plone.org
jenkins at plone.org
Tue Jul 15 21:16:02 UTC 2014
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 2787 - Failure!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/2787/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: plone.app.widgets
Branch: refs/heads/master
Date: 2014-05-03T02:36:27-05:00
Author: Nathan Van Gheem (vangheem) <vangheem at gmail.com>
Commit: https://github.com/plone/plone.app.widgets/commit/cfb67ac1b07c5955ca807d37e2e486f2b5ffff08
provide new upload pattern configuration options
Files changed:
M plone/app/widgets/utils.py
diff --git a/plone/app/widgets/utils.py b/plone/app/widgets/utils.py
index bc43cb9..7f20699 100644
--- a/plone/app/widgets/utils.py
+++ b/plone/app/widgets/utils.py
@@ -13,6 +13,8 @@
from zope.schema.interfaces import IVocabularyFactory
from z3c.form.interfaces import IAddForm
from Products.CMFCore.interfaces._content import IFolderish
+from plone.uuid.interfaces import IUUID
+from Products.CMFPlone.interfaces import IPloneSiteRoot
_ = MessageFactory('plone.app.widgets')
_plone = MessageFactory('plone')
@@ -156,6 +158,15 @@ def get_querystring_options(context, querystring_view):
def get_tinymce_options(context, field, request):
args = {'pattern_options': {}}
+ folder = context
+ if not IFolderish.providedBy(context):
+ folder = aq_parent(context)
+ if IPloneSiteRoot.providedBy(folder):
+ initial = None
+ else:
+ initial = IUUID(folder)
+ portal_url = get_portal_url(context)
+ current_path = folder.absolute_url()[len(portal_url):]
utility = getToolByName(aq_inner(context), 'portal_tinymce', None)
if utility:
@@ -173,8 +184,15 @@ def get_tinymce_options(context, field, request):
'vocabularyUrl': config['portal_url'] +
'/@@getVocabulary?name=plone.app.vocabularies.Catalog'
},
- 'rel_upload_path': '@@fileUpload',
- 'folder_url': config['document_base_url'],
+ 'upload': {
+ 'initialFolder': initial,
+ 'currentPath': current_path,
+ 'baseUrl': config['document_base_url'],
+ 'relativePath': '@@fileUpload',
+ 'uploadMultiple': False,
+ 'maxFiles': 1,
+ 'showTitle': False
+ },
'tiny': config,
'prependToUrl': 'resolveuid/',
'linkAttribute': 'UID',
@@ -185,17 +203,21 @@ def get_tinymce_options(context, field, request):
'linkableTypes': utility.linkable.replace('\n', ',')
}
else:
- folder = context
- if not IFolderish.providedBy(context):
- folder = aq_parent(context)
args['pattern_options'].update({
'relatedItems': {
- 'vocabularyUrl': get_portal_url(context) +
+ 'vocabularyUrl': portal_url +
'/@@getVocabulary?name=plone.app.vocabularies.Catalog'
},
+ 'upload': {
+ 'initialFolder': initial,
+ 'currentPath': current_path,
+ 'baseUrl': portal_url,
+ 'relativePath': '@@fileUpload',
+ 'uploadMultiple': False,
+ 'maxFiles': 1,
+ 'showTitle': False
+ },
'base_url': context.absolute_url(),
- 'rel_upload_path': '@@fileUpload',
- 'folder_url': folder.absolute_url(),
'prependToUrl': 'resolveuid/',
'linkAttribute': 'UID',
'prependToScalePart': '/@@images/image/',
Repository: plone.app.widgets
Branch: refs/heads/master
Date: 2014-05-09T09:57:37-05:00
Author: Nathan Van Gheem (vangheem) <vangheem at gmail.com>
Commit: https://github.com/plone/plone.app.widgets/commit/6a54f2aee2491a91ced3699689dd0c84c49bc62c
IUUID does not work on root
Files changed:
M plone/app/widgets/utils.py
diff --git a/plone/app/widgets/utils.py b/plone/app/widgets/utils.py
index 7f20699..1537170 100644
--- a/plone/app/widgets/utils.py
+++ b/plone/app/widgets/utils.py
@@ -164,7 +164,7 @@ def get_tinymce_options(context, field, request):
if IPloneSiteRoot.providedBy(folder):
initial = None
else:
- initial = IUUID(folder)
+ initial = IUUID(folder, None)
portal_url = get_portal_url(context)
current_path = folder.absolute_url()[len(portal_url):]
Repository: plone.app.widgets
Branch: refs/heads/master
Date: 2014-07-15T15:22:31-05:00
Author: Nathan Van Gheem (vangheem) <vangheem at gmail.com>
Commit: https://github.com/plone/plone.app.widgets/commit/bd0e25def23a204142ba0f755991be8c7d7c15d1
Merge pull request #70 from plone/mockup-upload
Integrate new upload pattern correctly
Files changed:
M plone/app/widgets/utils.py
diff --git a/plone/app/widgets/utils.py b/plone/app/widgets/utils.py
index bc43cb9..1537170 100644
--- a/plone/app/widgets/utils.py
+++ b/plone/app/widgets/utils.py
@@ -13,6 +13,8 @@
from zope.schema.interfaces import IVocabularyFactory
from z3c.form.interfaces import IAddForm
from Products.CMFCore.interfaces._content import IFolderish
+from plone.uuid.interfaces import IUUID
+from Products.CMFPlone.interfaces import IPloneSiteRoot
_ = MessageFactory('plone.app.widgets')
_plone = MessageFactory('plone')
@@ -156,6 +158,15 @@ def get_querystring_options(context, querystring_view):
def get_tinymce_options(context, field, request):
args = {'pattern_options': {}}
+ folder = context
+ if not IFolderish.providedBy(context):
+ folder = aq_parent(context)
+ if IPloneSiteRoot.providedBy(folder):
+ initial = None
+ else:
+ initial = IUUID(folder, None)
+ portal_url = get_portal_url(context)
+ current_path = folder.absolute_url()[len(portal_url):]
utility = getToolByName(aq_inner(context), 'portal_tinymce', None)
if utility:
@@ -173,8 +184,15 @@ def get_tinymce_options(context, field, request):
'vocabularyUrl': config['portal_url'] +
'/@@getVocabulary?name=plone.app.vocabularies.Catalog'
},
- 'rel_upload_path': '@@fileUpload',
- 'folder_url': config['document_base_url'],
+ 'upload': {
+ 'initialFolder': initial,
+ 'currentPath': current_path,
+ 'baseUrl': config['document_base_url'],
+ 'relativePath': '@@fileUpload',
+ 'uploadMultiple': False,
+ 'maxFiles': 1,
+ 'showTitle': False
+ },
'tiny': config,
'prependToUrl': 'resolveuid/',
'linkAttribute': 'UID',
@@ -185,17 +203,21 @@ def get_tinymce_options(context, field, request):
'linkableTypes': utility.linkable.replace('\n', ',')
}
else:
- folder = context
- if not IFolderish.providedBy(context):
- folder = aq_parent(context)
args['pattern_options'].update({
'relatedItems': {
- 'vocabularyUrl': get_portal_url(context) +
+ 'vocabularyUrl': portal_url +
'/@@getVocabulary?name=plone.app.vocabularies.Catalog'
},
+ 'upload': {
+ 'initialFolder': initial,
+ 'currentPath': current_path,
+ 'baseUrl': portal_url,
+ 'relativePath': '@@fileUpload',
+ 'uploadMultiple': False,
+ 'maxFiles': 1,
+ 'showTitle': False
+ },
'base_url': context.absolute_url(),
- 'rel_upload_path': '@@fileUpload',
- 'folder_url': folder.absolute_url(),
'prependToUrl': 'resolveuid/',
'linkAttribute': 'UID',
'prependToScalePart': '/@@images/image/',
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 7579 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140715/8e67fb48/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 399841 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140715/8e67fb48/attachment-0003.obj>
More information about the Testbot
mailing list