[Testbot] Plone 5.0 - Python 2.7 - Build # 1659 - Regression! - 1 failure(s)
jenkins at plone.org
jenkins at plone.org
Fri Feb 21 16:49:12 UTC 2014
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 1659 - Still Failing!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/1659/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T01:23:04-08:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/plone.app.contenttypes/commit/d5a032b79e4c7a717dbaac2b294c6f66aa503bc3
add info about branches and versions
Files changed:
M README.rst
diff --git a/README.rst b/README.rst
index 95433e3..0c4ab09 100644
--- a/README.rst
+++ b/README.rst
@@ -27,12 +27,14 @@ plone.app.contenttypes has been merged into the Plone 5.0 branch and will be shi
**Warning: Using plone.app.contenttypes on a site with existing content requires migrating the sites content. Please see the chapter "Migration". It can be used on a new site without problems.**
-Compatability
+Compatibility
=============
-plone.app.contenttypes is tested with Plone 4.3 and the upcoming Plone 5.0.
+Version 1.1b1 is tested with Plone 4.3.x. The versions 1.1.x will stay compatible with Plone 4.3.x.
-Version 1.0 and earlier should run with Plone 4.1+ but do not provide the full functionality.
+For support of Plone 4.1 and 4.2 please use version 1.0.x. Please note that they do not provide the full functionality.
+
+The future versions 1.2.x will be compatible with Plone 5 only and add support for plone.app.widgets
Installation
@@ -361,6 +363,14 @@ When you try to install plone.app.contenttypes in a existing site you might get
Before installing plone.app.contenttypes you have to reinstall plone.app.collection to update collections to the version that uses Dexterity.
+Branches
+========
+
+The master-branch supports Plone 5 only. From this 1.2.x-releases will be cut.
+
+The 1.1.x-branch supports Plone 4.3.x. From this 1.1.x-releases will be cut.
+
+
License
=======
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T01:31:58-08:00
Author: Timo Stollenwerk () <contact at timostollenwerk.net>
Commit: https://github.com/plone/plone.app.contenttypes/commit/f5c931de7d44b990629bfb42361e1ae977ab25d9
Run travis against Plone 4.3.2.
Files changed:
M travis.cfg
diff --git a/travis.cfg b/travis.cfg
index 086ed4d..361547a 100644
--- a/travis.cfg
+++ b/travis.cfg
@@ -9,10 +9,10 @@ download-cache = buildout-cache/downloads
[download]
recipe = hexagonit.recipe.download
-url = https://launchpad.net/plone/4.3/4.3/+download/Plone-4.3-UnifiedInstaller.tgz
+url = https://launchpad.net/plone/4.3/4.3.2/+download/Plone-4.3.2-UnifiedInstaller.tgz
[install]
recipe = collective.recipe.cmd
on_install = true
-cmds = tar jxvf ${download:location}/Plone-4.3-UnifiedInstaller/packages/buildout-cache.tar.bz2 1>/dev/null
+cmds = tar jxvf ${download:location}/Plone-4.3-2-UnifiedInstaller/packages/buildout-cache.tar.bz2 1>/dev/null
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T01:32:13-08:00
Author: Timo Stollenwerk () <contact at timostollenwerk.net>
Commit: https://github.com/plone/plone.app.contenttypes/commit/ab66a7329cc9469ef13686df956a6ae2d10e821b
Run travis for 1.1.x branch only (since master is tested by buildout.coredev).
Files changed:
M .travis.yml
diff --git a/.travis.yml b/.travis.yml
index 73dbed1..0c66ccb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
language: python
python: "2.7"
+branches:
+ only:
+ - 1.1.x
before_install:
- pip install http://effbot.org/downloads/Imaging-1.1.7.tar.gz
install:
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T01:32:39-08:00
Author: Timo Stollenwerk () <contact at timostollenwerk.net>
Commit: https://github.com/plone/plone.app.contenttypes/commit/588fedc44a8677469214157154522ed43cf2a30f
Switch to travis badge. Add more badges.
Files changed:
M README.rst
diff --git a/README.rst b/README.rst
index 95433e3..258c438 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,16 @@
Introduction
============
-.. image:: http://jenkins.plone.org/job/plone.app.contenttypes/badge/icon
+.. image:: https://travis-ci.org/plone/plone.app.contenttypes.png?branch=1.1.x :target: https://travis-ci.org/plone/plone.app.contenttypes
+
+.. image:: https://coveralls.io/repos/plone/plone.app.contenttypes/badge.png?branch=1.1.x
+ :target: https://coveralls.io/r/plone/plone.app.contenttypes
+
+.. image:: https://pypip.in/d/plone.app.contenttypes/badge.png
+ :target: https://crate.io/packages/plone.app.contenttypes
+
+.. image:: https://pypip.in/v/plone.app.contenttypes/badge.png
+ :target: https://crate.io/packages/plone.app.contenttypes
plone.app.contenttypes offers default content types for Plone based on Dexterity. This package replaces ``Products.ATContenttypes`` and will provide the default-types in Plone 5.
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T01:32:59-08:00
Author: Timo Stollenwerk () <contact at timostollenwerk.net>
Commit: https://github.com/plone/plone.app.contenttypes/commit/26c0c472e39de3d2a5792976923ae1a859cb2e77
Merge branch '1.1.x' of github.com:plone/plone.app.contenttypes into 1.1.x
Files changed:
M README.rst
diff --git a/README.rst b/README.rst
index 258c438..aec4401 100644
--- a/README.rst
+++ b/README.rst
@@ -36,12 +36,14 @@ plone.app.contenttypes has been merged into the Plone 5.0 branch and will be shi
**Warning: Using plone.app.contenttypes on a site with existing content requires migrating the sites content. Please see the chapter "Migration". It can be used on a new site without problems.**
-Compatability
+Compatibility
=============
-plone.app.contenttypes is tested with Plone 4.3 and the upcoming Plone 5.0.
+Version 1.1b1 is tested with Plone 4.3.x. The versions 1.1.x will stay compatible with Plone 4.3.x.
-Version 1.0 and earlier should run with Plone 4.1+ but do not provide the full functionality.
+For support of Plone 4.1 and 4.2 please use version 1.0.x. Please note that they do not provide the full functionality.
+
+The future versions 1.2.x will be compatible with Plone 5 only and add support for plone.app.widgets
Installation
@@ -370,6 +372,14 @@ When you try to install plone.app.contenttypes in a existing site you might get
Before installing plone.app.contenttypes you have to reinstall plone.app.collection to update collections to the version that uses Dexterity.
+Branches
+========
+
+The master-branch supports Plone 5 only. From this 1.2.x-releases will be cut.
+
+The 1.1.x-branch supports Plone 4.3.x. From this 1.1.x-releases will be cut.
+
+
License
=======
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T01:50:19-08:00
Author: Timo Stollenwerk () <contact at timostollenwerk.net>
Commit: https://github.com/plone/plone.app.contenttypes/commit/c81b1a03bda522d676333ccabd84791b87c960d7
Fix travis
Files changed:
M travis.cfg
diff --git a/travis.cfg b/travis.cfg
index 361547a..1fe0f28 100644
--- a/travis.cfg
+++ b/travis.cfg
@@ -14,5 +14,5 @@ url = https://launchpad.net/plone/4.3/4.3.2/+download/Plone-4.3.2-UnifiedInstall
[install]
recipe = collective.recipe.cmd
on_install = true
-cmds = tar jxvf ${download:location}/Plone-4.3-2-UnifiedInstaller/packages/buildout-cache.tar.bz2 1>/dev/null
+cmds = tar jxvf ${download:location}/Plone-4.3.2-UnifiedInstaller/packages/buildout-cache.tar.bz2 1>/dev/null
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T01:59:02-08:00
Author: Timo Stollenwerk () <contact at timostollenwerk.net>
Commit: https://github.com/plone/plone.app.contenttypes/commit/3704c42321a0a605c09196aae348d3b86e4ccabf
Add travis coveralls.
Files changed:
A .coveragerc
M travis.cfg
diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000..208e655
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,9 @@
+[report]
+omit =
+ /home/*/.buildout/eggs/*
+ /usr/*
+ bin/test
+ buildout-cache/eggs/*
+ eggs/*
+ parts/*
+
diff --git a/travis.cfg b/travis.cfg
index 1fe0f28..56ad0ff 100644
--- a/travis.cfg
+++ b/travis.cfg
@@ -4,6 +4,7 @@ parts =
download
install
test
+ createcoverage
eggs-directory = buildout-cache/eggs
download-cache = buildout-cache/downloads
@@ -16,3 +17,7 @@ recipe = collective.recipe.cmd
on_install = true
cmds = tar jxvf ${download:location}/Plone-4.3.2-UnifiedInstaller/packages/buildout-cache.tar.bz2 1>/dev/null
+[createcoverage]
+recipe = zc.recipe.egg
+eggs = createcoverage
+
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T02:08:45-08:00
Author: Timo Stollenwerk () <contact at timostollenwerk.net>
Commit: https://github.com/plone/plone.app.contenttypes/commit/24c87d4eb835fa1c62fcc4003b587ef2c4c383bd
Run test coverage and code analysis on travis.
Files changed:
M .travis.yml
M travis.cfg
diff --git a/.travis.yml b/.travis.yml
index 0c66ccb..8951d87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,4 +13,14 @@ install:
before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
-script: bin/test -s plone.app.contenttypes
+script:
+ - bin/test -s plone.app.contenttypes
+ - bin/code-analysis
+after_success:
+ - bin/createcoverage run bin/test
+ - pip install -q coveralls
+ - coveralls
+after_failure:
+ - bin/csslint --version
+ - bin/jshint --version
+
diff --git a/travis.cfg b/travis.cfg
index 56ad0ff..cc614a9 100644
--- a/travis.cfg
+++ b/travis.cfg
@@ -4,6 +4,7 @@ parts =
download
install
test
+ code-analyis
createcoverage
eggs-directory = buildout-cache/eggs
download-cache = buildout-cache/downloads
@@ -17,6 +18,10 @@ recipe = collective.recipe.cmd
on_install = true
cmds = tar jxvf ${download:location}/Plone-4.3.2-UnifiedInstaller/packages/buildout-cache.tar.bz2 1>/dev/null
+[code-analysis]
+recipe = plone.recipe.codeanalysis
+directory = ${buildout:directory}/plone/app/contenttypes
+
[createcoverage]
recipe = zc.recipe.egg
eggs = createcoverage
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T02:11:49-08:00
Author: Timo Stollenwerk () <contact at timostollenwerk.net>
Commit: https://github.com/plone/plone.app.contenttypes/commit/2adc390a77ae2e72df48a58b84682e253c61f39b
Fix typo in travis.cfg.
Files changed:
M travis.cfg
diff --git a/travis.cfg b/travis.cfg
index cc614a9..40c6edb 100644
--- a/travis.cfg
+++ b/travis.cfg
@@ -4,7 +4,7 @@ parts =
download
install
test
- code-analyis
+ code-analysis
createcoverage
eggs-directory = buildout-cache/eggs
download-cache = buildout-cache/downloads
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T02:19:17-08:00
Author: Timo Stollenwerk () <contact at timostollenwerk.net>
Commit: https://github.com/plone/plone.app.contenttypes/commit/9631ab1d425eac9a41bf349de9d5c46f6403d019
Pin pytz since this seems to cause problems on travis.
Files changed:
M test-plone-4.3.x.cfg
diff --git a/test-plone-4.3.x.cfg b/test-plone-4.3.x.cfg
index d539362..17fb823 100644
--- a/test-plone-4.3.x.cfg
+++ b/test-plone-4.3.x.cfg
@@ -114,6 +114,9 @@ robotframework-selenium2screenshots = 0.4.0
sphinxcontrib-robotframework = 0.4.3
Pygments = 1.6
+# misc
+pytz = 2013.9
+
[robot]
recipe = zc.recipe.egg
eggs =
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T02:28:30-08:00
Author: Timo Stollenwerk () <contact at timostollenwerk.net>
Commit: https://github.com/plone/plone.app.contenttypes/commit/e442b45160bcbc49862bbe648c00eb62fb9aeff6
Trigger travis.
Files changed:
M CHANGES.rst
diff --git a/CHANGES.rst b/CHANGES.rst
index 675ace8..1de7b31 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -45,6 +45,7 @@ Changelog
contains variables (Fix #110).
[rafaelbco]
+
1.1a1 (2013-11-22)
------------------
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T02:29:43-08:00
Author: Timo Stollenwerk () <contact at timostollenwerk.net>
Commit: https://github.com/plone/plone.app.contenttypes/commit/e0dd7266e22083d00b7a902e802ce2435c6833d9
Comment out test coverage and code analysis for now.
Files changed:
M travis.cfg
diff --git a/travis.cfg b/travis.cfg
index 40c6edb..6130f96 100644
--- a/travis.cfg
+++ b/travis.cfg
@@ -4,8 +4,8 @@ parts =
download
install
test
- code-analysis
- createcoverage
+# code-analysis
+# createcoverage
eggs-directory = buildout-cache/eggs
download-cache = buildout-cache/downloads
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T02:39:53-08:00
Author: Timo Stollenwerk () <contact at timostollenwerk.net>
Commit: https://github.com/plone/plone.app.contenttypes/commit/2dfda0ab8ce14012a55df3454fe00e1ed0ae7bf4
Do not run cover or code analysis for now.
Files changed:
M .travis.yml
diff --git a/.travis.yml b/.travis.yml
index 8951d87..a1447d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,11 +15,11 @@ before_script:
- "sh -e /etc/init.d/xvfb start"
script:
- bin/test -s plone.app.contenttypes
- - bin/code-analysis
-after_success:
- - bin/createcoverage run bin/test
- - pip install -q coveralls
- - coveralls
+# - bin/code-analysis
+#after_success:
+# - bin/createcoverage run bin/test
+# - pip install -q coveralls
+# - coveralls
after_failure:
- bin/csslint --version
- bin/jshint --version
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T03:14:13-08:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/plone.app.contenttypes/commit/5d70b51c577a4f4fd531f42d59e8247982b4f5f9
no coverage-icon for now
Files changed:
M README.rst
diff --git a/README.rst b/README.rst
index aec4401..4572702 100644
--- a/README.rst
+++ b/README.rst
@@ -3,16 +3,14 @@
Introduction
============
-.. image:: https://travis-ci.org/plone/plone.app.contenttypes.png?branch=1.1.x :target: https://travis-ci.org/plone/plone.app.contenttypes
-
-.. image:: https://coveralls.io/repos/plone/plone.app.contenttypes/badge.png?branch=1.1.x
- :target: https://coveralls.io/r/plone/plone.app.contenttypes
+.. image:: https://travis-ci.org/plone/plone.app.contenttypes.png?branch=1.1.x
+ :target: https://travis-ci.org/plone/plone.app.contenttypes
.. image:: https://pypip.in/d/plone.app.contenttypes/badge.png
- :target: https://crate.io/packages/plone.app.contenttypes
+ :target: https://crate.io/packages/plone.app.contenttypes
.. image:: https://pypip.in/v/plone.app.contenttypes/badge.png
- :target: https://crate.io/packages/plone.app.contenttypes
+ :target: https://crate.io/packages/plone.app.contenttypes
plone.app.contenttypes offers default content types for Plone based on Dexterity. This package replaces ``Products.ATContenttypes`` and will provide the default-types in Plone 5.
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T03:15:56-08:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/plone.app.contenttypes/commit/ec7fd0dfce8aba03039a777799155977cd3f222e
Preparing release 1.1b1
Files changed:
M CHANGES.rst
M setup.py
diff --git a/CHANGES.rst b/CHANGES.rst
index 1de7b31..1e20bbc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,7 @@
Changelog
=========
-1.1a2 (unreleased)
+1.1b1 (2014-02-19)
------------------
- Add tests for collections and collection-migrations.
diff --git a/setup.py b/setup.py
index a2f2d75..0de3ba6 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = '1.1a2.dev0'
+version = '1.1b1'
long_description = open("README.rst").read() + "\n" + \
open("CHANGES.rst").read()
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T03:18:14-08:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/plone.app.contenttypes/commit/772a8f3a0e7225e1e016b5afc7c12ee2a5376c4f
Back to development: 1.1b2
Files changed:
M CHANGES.rst
M setup.py
diff --git a/CHANGES.rst b/CHANGES.rst
index 1e20bbc..7b21711 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,12 @@
Changelog
=========
+1.1b2 (unreleased)
+------------------
+
+- Nothing changed yet.
+
+
1.1b1 (2014-02-19)
------------------
diff --git a/setup.py b/setup.py
index 0de3ba6..fc8e3f1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = '1.1b1'
+version = '1.1b2.dev0'
long_description = open("README.rst").read() + "\n" + \
open("CHANGES.rst").read()
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T05:31:08-08:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/plone.app.contenttypes/commit/5e0ca87c13e2b9ad7495d7078be1d74ce391c46a
remove outdated behavior from event
Files changed:
M plone/app/contenttypes/profiles/default/types/Event.xml
diff --git a/plone/app/contenttypes/profiles/default/types/Event.xml b/plone/app/contenttypes/profiles/default/types/Event.xml
index 9912e42..bfcd5f5 100644
--- a/plone/app/contenttypes/profiles/default/types/Event.xml
+++ b/plone/app/contenttypes/profiles/default/types/Event.xml
@@ -29,7 +29,6 @@
<element value="plone.app.event.dx.behaviors.IEventLocation"/>
<element value="plone.app.event.dx.behaviors.IEventAttendees"/>
<element value="plone.app.event.dx.behaviors.IEventContact"/>
- <element value="plone.app.event.dx.behaviors.IEventSummary"/>
<element value="plone.app.dexterity.behaviors.metadata.IDublinCore"/>
<element value="plone.app.content.interfaces.INameFromTitle"/>
<element value="plone.app.contenttypes.behaviors.richtext.IRichText"/>
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T05:31:55-08:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/plone.app.contenttypes/commit/c74c397fede2579409b55c04af0424126d127ee0
delete at member-folder before creating new default-content
Files changed:
M plone/app/contenttypes/setuphandlers.py
diff --git a/plone/app/contenttypes/setuphandlers.py b/plone/app/contenttypes/setuphandlers.py
index a2418c2..a87ef60 100644
--- a/plone/app/contenttypes/setuphandlers.py
+++ b/plone/app/contenttypes/setuphandlers.py
@@ -387,7 +387,7 @@ def _delete_at_example_content(portal):
]
if not [i.id for i in all_content] == expected:
return
- to_delete = ['front-page', 'news', 'events']
+ to_delete = ['front-page', 'news', 'events', 'Members']
for i in to_delete:
obj = portal[i]
if IDexterityContent.providedBy(obj):
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T07:22:45-08:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/plone.app.contenttypes/commit/8bb94496fe301c046399be63ac2cb9857462996e
re-add and register empty schema-files so we need no additional update-step to fix the fti's
Files changed:
A plone/app/contenttypes/schema/collection.xml
A plone/app/contenttypes/schema/document.xml
A plone/app/contenttypes/schema/event.xml
A plone/app/contenttypes/schema/news_item.xml
M plone/app/contenttypes/profiles/default/types/Collection.xml
M plone/app/contenttypes/profiles/default/types/Document.xml
M plone/app/contenttypes/profiles/default/types/Event.xml
M plone/app/contenttypes/profiles/default/types/File.xml
M plone/app/contenttypes/profiles/default/types/Folder.xml
M plone/app/contenttypes/profiles/default/types/Image.xml
M plone/app/contenttypes/profiles/default/types/Link.xml
M plone/app/contenttypes/profiles/default/types/News_Item.xml
diff --git a/plone/app/contenttypes/profiles/default/types/Collection.xml b/plone/app/contenttypes/profiles/default/types/Collection.xml
index c51276f..1b067b4 100644
--- a/plone/app/contenttypes/profiles/default/types/Collection.xml
+++ b/plone/app/contenttypes/profiles/default/types/Collection.xml
@@ -11,8 +11,11 @@
<property name="filter_content_types">False</property>
<property name="allowed_content_types" />
<property name="allow_discussion">False</property>
- <property name="klass">plone.app.contenttypes.content.Collection</property>
<property name="add_permission">plone.app.contenttypes.addCollection</property>
+ <property name="klass">plone.app.contenttypes.content.Collection</property>
+ <property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:collection.xml</property>
<property name="behaviors">
<element value="plone.app.content.interfaces.INameFromTitle"/>
<element value="plone.app.contenttypes.behaviors.collection.ICollection"/>
diff --git a/plone/app/contenttypes/profiles/default/types/Document.xml b/plone/app/contenttypes/profiles/default/types/Document.xml
index 27b774e..61d5f78 100644
--- a/plone/app/contenttypes/profiles/default/types/Document.xml
+++ b/plone/app/contenttypes/profiles/default/types/Document.xml
@@ -19,6 +19,9 @@
<property name="default_view_fallback">False</property>
<property name="add_permission">plone.app.contenttypes.addDocument</property>
<property name="klass">plone.app.contenttypes.content.Document</property>
+ <property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:document.xml</property>
<property name="behaviors">
<element value="plone.app.content.interfaces.INameFromTitle"/>
<element value="plone.app.dexterity.behaviors.discussion.IAllowDiscussion"/>
diff --git a/plone/app/contenttypes/profiles/default/types/Event.xml b/plone/app/contenttypes/profiles/default/types/Event.xml
index bfcd5f5..08cb111 100644
--- a/plone/app/contenttypes/profiles/default/types/Event.xml
+++ b/plone/app/contenttypes/profiles/default/types/Event.xml
@@ -20,6 +20,8 @@
<!-- Schema, class and security -->
<property name="klass">plone.app.contenttypes.content.Event</property>
<property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:event.xml</property>
<property name="add_permission">plone.app.contenttypes.addEvent</property>
<!-- Enabled behaviors -->
diff --git a/plone/app/contenttypes/profiles/default/types/File.xml b/plone/app/contenttypes/profiles/default/types/File.xml
index 25a5c53..5a073af 100644
--- a/plone/app/contenttypes/profiles/default/types/File.xml
+++ b/plone/app/contenttypes/profiles/default/types/File.xml
@@ -19,6 +19,9 @@
<property name="default_view_fallback">False</property>
<property name="add_permission">plone.app.contenttypes.addFile</property>
<property name="klass">plone.app.contenttypes.content.File</property>
+ <property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:file.xml</property>
<property name="behaviors">
<element value="plone.app.dexterity.behaviors.metadata.ICategorization"/>
<element value="plone.app.dexterity.behaviors.metadata.IPublication"/>
@@ -28,9 +31,6 @@
<element value="plone.app.dexterity.behaviors.exclfromnav.IExcludeFromNavigation"/>
<element value="plone.app.relationfield.behavior.IRelatedItems"/>
</property>
- <property name="schema"></property>
- <property name="model_source"></property>
- <property name="model_file">plone.app.contenttypes.schema:file.xml</property>
<alias from="(Default)" to="@@display-file"/>
<alias from="edit" to="@@edit"/>
<alias from="sharing" to="@@sharing"/>
diff --git a/plone/app/contenttypes/profiles/default/types/Folder.xml b/plone/app/contenttypes/profiles/default/types/Folder.xml
index 1316e6e..758055f 100644
--- a/plone/app/contenttypes/profiles/default/types/Folder.xml
+++ b/plone/app/contenttypes/profiles/default/types/Folder.xml
@@ -23,6 +23,9 @@
<property name="default_view_fallback">False</property>
<property name="add_permission">plone.app.contenttypes.addFolder</property>
<property name="klass">plone.app.contenttypes.content.Folder</property>
+ <property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:folder.xml</property>
<property name="behaviors">
<element value="plone.app.dexterity.behaviors.metadata.IDublinCore"/>
<element value="plone.app.content.interfaces.INameFromTitle"/>
@@ -33,9 +36,6 @@
<element value="plone.app.relationfield.behavior.IRelatedItems"/>
<element value="plone.app.dexterity.behaviors.nextprevious.INextPreviousToggle"/>
</property>
- <property name="schema"></property>
- <property name="model_source"></property>
- <property name="model_file">plone.app.contenttypes.schema:folder.xml</property>
<alias from="(Default)" to="(dynamic view)"/>
<alias from="edit" to="@@edit"/>
<alias from="sharing" to="@@sharing"/>
diff --git a/plone/app/contenttypes/profiles/default/types/Image.xml b/plone/app/contenttypes/profiles/default/types/Image.xml
index 0c853ce..78f482e 100644
--- a/plone/app/contenttypes/profiles/default/types/Image.xml
+++ b/plone/app/contenttypes/profiles/default/types/Image.xml
@@ -20,6 +20,9 @@
<property name="default_view_fallback">False</property>
<property name="add_permission">plone.app.contenttypes.addImage</property>
<property name="klass">plone.app.contenttypes.content.Image</property>
+ <property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:image.xml</property>
<property name="behaviors">
<element value="plone.app.dexterity.behaviors.metadata.ICategorization"/>
<element value="plone.app.dexterity.behaviors.metadata.IPublication"/>
@@ -29,9 +32,6 @@
<element value="plone.app.dexterity.behaviors.exclfromnav.IExcludeFromNavigation"/>
<element value="plone.app.relationfield.behavior.IRelatedItems"/>
</property>
- <property name="schema"></property>
- <property name="model_source"></property>
- <property name="model_file">plone.app.contenttypes.schema:image.xml</property>
<alias from="(Default)" to="@@display-file"/>
<alias from="edit" to="@@edit"/>
<alias from="sharing" to="@@sharing"/>
diff --git a/plone/app/contenttypes/profiles/default/types/Link.xml b/plone/app/contenttypes/profiles/default/types/Link.xml
index 909ce96..0e93a14 100644
--- a/plone/app/contenttypes/profiles/default/types/Link.xml
+++ b/plone/app/contenttypes/profiles/default/types/Link.xml
@@ -19,6 +19,9 @@
<property name="default_view_fallback">False</property>
<property name="add_permission">plone.app.contenttypes.addLink</property>
<property name="klass">plone.app.contenttypes.content.Link</property>
+ <property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:link.xml</property>
<property name="behaviors">
<element value="plone.app.dexterity.behaviors.discussion.IAllowDiscussion"/>
<element value="plone.app.dexterity.behaviors.metadata.IDublinCore"/>
@@ -26,9 +29,6 @@
<element value="plone.app.dexterity.behaviors.exclfromnav.IExcludeFromNavigation"/>
<element value="plone.app.versioningbehavior.behaviors.IVersionable" />
</property>
- <property name="schema"></property>
- <property name="model_source"></property>
- <property name="model_file">plone.app.contenttypes.schema:link.xml</property>
<alias from="(Default)" to="(dynamic view)"/>
<alias from="edit" to="@@edit"/>
<alias from="sharing" to="@@sharing"/>
diff --git a/plone/app/contenttypes/profiles/default/types/News_Item.xml b/plone/app/contenttypes/profiles/default/types/News_Item.xml
index 98c986f..1ad76f6 100644
--- a/plone/app/contenttypes/profiles/default/types/News_Item.xml
+++ b/plone/app/contenttypes/profiles/default/types/News_Item.xml
@@ -19,6 +19,9 @@
<property name="default_view_fallback">False</property>
<property name="add_permission">plone.app.contenttypes.addNewsItem</property>
<property name="klass">plone.app.contenttypes.content.NewsItem</property>
+ <property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:news_item.xml</property>
<property name="behaviors">
<element value="plone.app.dexterity.behaviors.metadata.IDublinCore"/>
<element value="plone.app.contenttypes.behaviors.richtext.IRichText"/>
diff --git a/plone/app/contenttypes/schema/collection.xml b/plone/app/contenttypes/schema/collection.xml
new file mode 100644
index 0000000..f76eaf8
--- /dev/null
+++ b/plone/app/contenttypes/schema/collection.xml
@@ -0,0 +1,4 @@
+<model xmlns="http://namespaces.plone.org/supermodel/schema">
+ <schema>
+ </schema>
+</model>
\ No newline at end of file
diff --git a/plone/app/contenttypes/schema/document.xml b/plone/app/contenttypes/schema/document.xml
new file mode 100644
index 0000000..f76eaf8
--- /dev/null
+++ b/plone/app/contenttypes/schema/document.xml
@@ -0,0 +1,4 @@
+<model xmlns="http://namespaces.plone.org/supermodel/schema">
+ <schema>
+ </schema>
+</model>
\ No newline at end of file
diff --git a/plone/app/contenttypes/schema/event.xml b/plone/app/contenttypes/schema/event.xml
new file mode 100644
index 0000000..f76eaf8
--- /dev/null
+++ b/plone/app/contenttypes/schema/event.xml
@@ -0,0 +1,4 @@
+<model xmlns="http://namespaces.plone.org/supermodel/schema">
+ <schema>
+ </schema>
+</model>
\ No newline at end of file
diff --git a/plone/app/contenttypes/schema/news_item.xml b/plone/app/contenttypes/schema/news_item.xml
new file mode 100644
index 0000000..f76eaf8
--- /dev/null
+++ b/plone/app/contenttypes/schema/news_item.xml
@@ -0,0 +1,4 @@
+<model xmlns="http://namespaces.plone.org/supermodel/schema">
+ <schema>
+ </schema>
+</model>
\ No newline at end of file
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-19T08:34:28-08:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/plone.app.contenttypes/commit/2ec76c7eaae3283099cf5c99b238f0bb0bca2b62
add upgrade-step to migrate to behavior-driven richtext-fields
Files changed:
M plone/app/contenttypes/profiles/default/metadata.xml
M plone/app/contenttypes/upgrades.py
M plone/app/contenttypes/upgrades.zcml
diff --git a/plone/app/contenttypes/profiles/default/metadata.xml b/plone/app/contenttypes/profiles/default/metadata.xml
index 202ac0f..3d0b3a1 100644
--- a/plone/app/contenttypes/profiles/default/metadata.xml
+++ b/plone/app/contenttypes/profiles/default/metadata.xml
@@ -1,5 +1,5 @@
<metadata>
- <version>1100</version>
+ <version>1101</version>
<dependencies>
<dependency>profile-plone.app.dexterity:default</dependency>
<dependency>profile-plone.app.event:default</dependency>
diff --git a/plone/app/contenttypes/upgrades.py b/plone/app/contenttypes/upgrades.py
index 2557804..3b44de4 100644
--- a/plone/app/contenttypes/upgrades.py
+++ b/plone/app/contenttypes/upgrades.py
@@ -47,7 +47,6 @@ def update_fti(context):
def enable_collection_behavior(context):
"""Enable collection behavior on Collection.
"""
- # Document
fti = queryUtility(
IDexterityFTI,
name='Collection'
@@ -55,8 +54,16 @@ def enable_collection_behavior(context):
behavior = 'plone.app.contenttypes.behaviors.collection.ICollection'
if behavior in fti.behaviors:
return
- new = list(fti.behaviors)
- new.append(behavior)
- fti.behaviors = tuple(new)
- if fti.schema == 'plone.app.contenttypes.interfaces.ICollection':
- fti.schema = None
+ behaviors = list(fti.behaviors)
+ behaviors.append(behavior)
+ behaviors = tuple(behaviors)
+ fti._updateProperty('behaviors', behaviors)
+
+
+def migrate_to_richtext(context):
+ """update fti's to add RichText behaviors and remove old text-fields"""
+
+ context.runImportStepFromProfile(
+ 'profile-plone.app.contenttypes:default',
+ 'typeinfo',
+ )
diff --git a/plone/app/contenttypes/upgrades.zcml b/plone/app/contenttypes/upgrades.zcml
index da2f4e0..4b88a3e 100644
--- a/plone/app/contenttypes/upgrades.zcml
+++ b/plone/app/contenttypes/upgrades.zcml
@@ -33,4 +33,13 @@
/>
</configure>
+ <genericsetup:upgradeStep
+ source="1100"
+ destination="1101"
+ title="Update to new RichText behavior"
+ description=""
+ profile="plone.app.contenttypes:default"
+ handler=".upgrades.migrate_to_richtext"
+ />
+
</configure>
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-20T03:28:02-08:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/plone.app.contenttypes/commit/0ed25aaf529a7679e7c3cc7e964360038b4387b8
fix ATWarningViewlet
Files changed:
M plone/app/contenttypes/browser/templates/archetypes_warning_viewlet.pt
M plone/app/contenttypes/browser/viewlets.py
diff --git a/plone/app/contenttypes/browser/templates/archetypes_warning_viewlet.pt b/plone/app/contenttypes/browser/templates/archetypes_warning_viewlet.pt
index bcac682..0d49ce9 100644
--- a/plone/app/contenttypes/browser/templates/archetypes_warning_viewlet.pt
+++ b/plone/app/contenttypes/browser/templates/archetypes_warning_viewlet.pt
@@ -1,3 +1,4 @@
+<tal:available condition="view/available">
<dl class="portalMessage alert-box secondary warning"
i18n:domain="plone">
<dt i18n:translate="">Warning</dt>
@@ -17,4 +18,5 @@
<style type="text/css">
#contentview-edit {display: None;}
-</style>
\ No newline at end of file
+</style>
+</tal:available>
\ No newline at end of file
diff --git a/plone/app/contenttypes/browser/viewlets.py b/plone/app/contenttypes/browser/viewlets.py
index 32772a7..2b58ba3 100644
--- a/plone/app/contenttypes/browser/viewlets.py
+++ b/plone/app/contenttypes/browser/viewlets.py
@@ -23,6 +23,20 @@ def update(self):
if not HAS_ARCHETYPES:
return
self.context = aq_inner(self.context)
+ replaced_types = [
+ 'ATFolder',
+ 'ATDocument',
+ 'ATFile',
+ 'ATImage',
+ 'ATNewsItem',
+ 'ATLink',
+ 'ATEvent',
+ 'ATBlobImage',
+ 'ATBlobFile',
+ 'Collection'
+ ]
+ if self.context.meta_type not in replaced_types:
+ return
if not IBaseObject.providedBy(self.context):
return
context_fti = self.context.getTypeInfo()
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-20T04:46:27-08:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/plone.app.contenttypes/commit/ff2fa96d596cc5fb7d1a197896c9f6b1307e5e8a
explain the atrefs extra
Files changed:
M README.rst
diff --git a/README.rst b/README.rst
index 4572702..bababd6 100644
--- a/README.rst
+++ b/README.rst
@@ -53,9 +53,11 @@ Add this line in the eggs section of your ``buildout.cfg``::
...
plone.app.contenttypes
-If you have a mixed Plone site with Archetypes content and dexterity content use the extra requirement::
+If you have a Plone site with mixed Archetypes and Dexterity content use the extra requirement ``atrefs``.::
- ``plone.app.contenttypes ['atrefs']``
+ ``plone.app.contenttypes [atrefs]``
+
+This also installs the package `plone.app.referenceablebehavior <https://pypi.python.org/pypi/plone.app.referenceablebehavior>`_. You will have to enable the behavior ``plone.app.referenceablebehavior.referenceable.IReferenceable`` for all types that need to be referenced by Archetypes-content.
What happens to existing content?
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-20T13:15:19-08:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/plone.app.contenttypes/commit/62306acbc7a0563154534f8a36ec444d97570d4f
update Changelog
Files changed:
M CHANGES.rst
diff --git a/CHANGES.rst b/CHANGES.rst
index 7b21711..79626b1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,19 @@ Changelog
1.1b2 (unreleased)
------------------
-- Nothing changed yet.
+- Fix viewlet warning about ineditable content (fixes #130)
+ [pbauer]
+
+- Reintroduce the removed schema-files and add upgrade-step to migrate to
+ behavior-driven richtext-fields (fixes #127)
+ [pbauer]
+
+- Delete Archetypes Member-folder before creating new default-content
+ (fixes #128)
+ [pbauer]
+
+- Remove outdated summary-behavior from event (fixes #129)
+ [pbauer]
1.1b1 (2014-02-19)
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-20T22:33:28-08:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/plone.app.contenttypes/commit/89ad0e8fd7218665700a103f82132e2500e8b4aa
Prepare pinn-information for 4.3.3. Mention issue-tracker.
Files changed:
M README.rst
diff --git a/README.rst b/README.rst
index bababd6..48e398e 100644
--- a/README.rst
+++ b/README.rst
@@ -107,7 +107,18 @@ Dependencies
* ``plone.app.portlets >= 2.5a1``. In older version the event-portlet will not work with the new event-type.
-These are the version-pinns for Plone 4.3.2:
+These are the version-pinns for Plone 4.3.3:
+
+.. code:: ini
+
+ [buildout]
+ versions = versions
+
+ [versions]
+ plone.app.event = 1.1b1
+ plone.app.portlets = 2.5a1
+
+Plone-versions before 4.3.3 need to pinn more packages:
.. code:: ini
@@ -171,9 +182,9 @@ Migrating from old versions of plone.app.contenttypes
Before version 1.0a2 the content-items did not implement marker-interfaces. They will break in newer versions since the views are now registered for these interfaces (e.g. ``plone.app.contenttypes.interfaces.IDocument``). To fix this you can call the view ``/@@fix_base_classes`` on your site-root.
-Since plone.app.contenttypes 1.1, the Collection type uses the new Collection behavior and the Event type utilizes behaviors from `plone.app.event <http://pypi.python.org/pypi/plone.app.event>`_. In order to upgrade:
+Since plone.app.contenttypes 1.1a1, the Collection type uses the new Collection behavior and the Event type utilizes behaviors from `plone.app.event <http://pypi.python.org/pypi/plone.app.event>`_. In order to upgrade:
-1) First run the default profile (``plone.app.contenttypes:default``) and
+1) First run the default profile (``plone.app.contenttypes:default``) or reinstall plone.app.contenttypes
2) Then run the upgrade steps.
@@ -352,16 +363,18 @@ Differences to Products.ATContentTypes
- There is no more field ``Location``. If you need georeferenceable consider using ``collective.geo.behaviour``
- The link on the image of the newsitem triggers an overlay
- The link-type now allows the of the variables ``${navigation_root_url}`` and ``${portal_url}`` to construct relative urls.
-- The keywords-widget is nit implemented and ootb is only a lines-widget. See the section on widgets.
+- The keywords-widget is not implemented and is replaced by a simple lines-widget unless you override it or use plone.app.widgets. Please see the section on widgets.
Toubleshooting
==============
+Please report issues in the bugtracker at https://github.com/plone/plone.app.contenttypes/issues.
+
ValueError on installing
------------------------
-When you try to install plone.app.contenttypes in a existing site you might get the following error::
+When you try to install plone.app.contenttypes < 1.1a1 in a existing site you might get the following error::
(...)
Module Products.GenericSetup.utils, line 509, in _importBody
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-21T00:08:01-08:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/plone.app.contenttypes/commit/0c721f4b4a12a35cc9186a958ec8667274acde1c
Merge branch '1.1.x'
Conflicts:
README.rst
plone/app/contenttypes/upgrades.py
travis.cfg
Files changed:
A .coveragerc
A plone/app/contenttypes/schema/collection.xml
A plone/app/contenttypes/schema/document.xml
A plone/app/contenttypes/schema/event.xml
A plone/app/contenttypes/schema/news_item.xml
M .travis.yml
M CHANGES.rst
M README.rst
M plone/app/contenttypes/browser/templates/archetypes_warning_viewlet.pt
M plone/app/contenttypes/browser/viewlets.py
M plone/app/contenttypes/profiles/default/types/Collection.xml
M plone/app/contenttypes/profiles/default/types/Document.xml
M plone/app/contenttypes/profiles/default/types/Event.xml
M plone/app/contenttypes/profiles/default/types/File.xml
M plone/app/contenttypes/profiles/default/types/Folder.xml
M plone/app/contenttypes/profiles/default/types/Image.xml
M plone/app/contenttypes/profiles/default/types/Link.xml
M plone/app/contenttypes/profiles/default/types/News_Item.xml
M plone/app/contenttypes/setuphandlers.py
M plone/app/contenttypes/upgrades.py
M setup.py
M test-plone-4.3.x.cfg
M travis.cfg
diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000..208e655
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,9 @@
+[report]
+omit =
+ /home/*/.buildout/eggs/*
+ /usr/*
+ bin/test
+ buildout-cache/eggs/*
+ eggs/*
+ parts/*
+
diff --git a/.travis.yml b/.travis.yml
index 0c66ccb..a1447d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,4 +13,14 @@ install:
before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
-script: bin/test -s plone.app.contenttypes
+script:
+ - bin/test -s plone.app.contenttypes
+# - bin/code-analysis
+#after_success:
+# - bin/createcoverage run bin/test
+# - pip install -q coveralls
+# - coveralls
+after_failure:
+ - bin/csslint --version
+ - bin/jshint --version
+
diff --git a/CHANGES.rst b/CHANGES.rst
index 675ace8..79626b1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,25 @@
Changelog
=========
-1.1a2 (unreleased)
+1.1b2 (unreleased)
+------------------
+
+- Fix viewlet warning about ineditable content (fixes #130)
+ [pbauer]
+
+- Reintroduce the removed schema-files and add upgrade-step to migrate to
+ behavior-driven richtext-fields (fixes #127)
+ [pbauer]
+
+- Delete Archetypes Member-folder before creating new default-content
+ (fixes #128)
+ [pbauer]
+
+- Remove outdated summary-behavior from event (fixes #129)
+ [pbauer]
+
+
+1.1b1 (2014-02-19)
------------------
- Add tests for collections and collection-migrations.
@@ -45,6 +63,7 @@ Changelog
contains variables (Fix #110).
[rafaelbco]
+
1.1a1 (2013-11-22)
------------------
diff --git a/README.rst b/README.rst
index b679f62..887db6a 100644
--- a/README.rst
+++ b/README.rst
@@ -3,19 +3,18 @@
.. image:: https://travis-ci.org/plone/plone.app.contenttypes.png?branch=master
:target: http://travis-ci.org/plone/plone.app.contenttypes
-.. image:: https://coveralls.io/repos/plone/plone.app.contenttypes/badge.png?branch=master
- :target: https://coveralls.io/r/plone/plone.app.contenttypes
-
.. image:: https://pypip.in/d/plone.app.contenttypes/badge.png
- :target: https://crate.io/packages/plone.app.contenttypes
+ :target: https://crate.io/packages/plone.app.contenttypes
.. image:: https://pypip.in/v/plone.app.contenttypes/badge.png
- :target: https://crate.io/packages/plone.app.contenttypes
+ :target: https://crate.io/packages/plone.app.contenttypes
+
Introduction
============
+
plone.app.contenttypes offers default content types for Plone based on Dexterity. This package replaces ``Products.ATContenttypes`` and will provide the default-types in Plone 5.
It contains the following types:
@@ -38,12 +37,14 @@ plone.app.contenttypes has been merged into the Plone 5.0 branch and will be shi
**Warning: Using plone.app.contenttypes on a site with existing content requires migrating the sites content. Please see the chapter "Migration". It can be used on a new site without problems.**
-Compatability
+Compatibility
=============
-plone.app.contenttypes is tested with Plone 4.3 and the upcoming Plone 5.0.
+Version 1.1b1 is tested with Plone 4.3.x. The versions 1.1.x will stay compatible with Plone 4.3.x.
-Version 1.0 and earlier should run with Plone 4.1+ but do not provide the full functionality.
+For support of Plone 4.1 and 4.2 please use version 1.0.x. Please note that they do not provide the full functionality.
+
+The future versions 1.2.x will be compatible with Plone 5 only and add support for plone.app.widgets
Installation
@@ -55,9 +56,11 @@ Add this line in the eggs section of your ``buildout.cfg``::
...
plone.app.contenttypes
-If you have a mixed Plone site with Archetypes content and dexterity content use the extra requirement::
+If you have a Plone site with mixed Archetypes and Dexterity content use the extra requirement ``atrefs``.::
+
+ ``plone.app.contenttypes [atrefs]``
- ``plone.app.contenttypes ['atrefs']``
+This also installs the package `plone.app.referenceablebehavior <https://pypi.python.org/pypi/plone.app.referenceablebehavior>`_. You will have to enable the behavior ``plone.app.referenceablebehavior.referenceable.IReferenceable`` for all types that need to be referenced by Archetypes-content.
What happens to existing content?
@@ -107,7 +110,18 @@ Dependencies
* ``plone.app.portlets >= 2.5a1``. In older version the event-portlet will not work with the new event-type.
-These are the version-pinns for Plone 4.3.2:
+These are the version-pinns for Plone 4.3.3:
+
+.. code:: ini
+
+ [buildout]
+ versions = versions
+
+ [versions]
+ plone.app.event = 1.1b1
+ plone.app.portlets = 2.5a1
+
+Plone-versions before 4.3.3 need to pinn more packages:
.. code:: ini
@@ -171,9 +185,9 @@ Migrating from old versions of plone.app.contenttypes
Before version 1.0a2 the content-items did not implement marker-interfaces. They will break in newer versions since the views are now registered for these interfaces (e.g. ``plone.app.contenttypes.interfaces.IDocument``). To fix this you can call the view ``/@@fix_base_classes`` on your site-root.
-Since plone.app.contenttypes 1.1, the Collection type uses the new Collection behavior and the Event type utilizes behaviors from `plone.app.event <http://pypi.python.org/pypi/plone.app.event>`_. In order to upgrade:
+Since plone.app.contenttypes 1.1a1, the Collection type uses the new Collection behavior and the Event type utilizes behaviors from `plone.app.event <http://pypi.python.org/pypi/plone.app.event>`_. In order to upgrade:
-1) First run the default profile (``plone.app.contenttypes:default``) and
+1) First run the default profile (``plone.app.contenttypes:default``) or reinstall plone.app.contenttypes
2) Then run the upgrade steps.
@@ -352,16 +366,18 @@ Differences to Products.ATContentTypes
- There is no more field ``Location``. If you need georeferenceable consider using ``collective.geo.behaviour``
- The link on the image of the newsitem triggers an overlay
- The link-type now allows the of the variables ``${navigation_root_url}`` and ``${portal_url}`` to construct relative urls.
-- The keywords-widget is nit implemented and ootb is only a lines-widget. See the section on widgets.
+- The keywords-widget is not implemented and is replaced by a simple lines-widget unless you override it or use plone.app.widgets. Please see the section on widgets.
Toubleshooting
==============
+Please report issues in the bugtracker at https://github.com/plone/plone.app.contenttypes/issues.
+
ValueError on installing
------------------------
-When you try to install plone.app.contenttypes in a existing site you might get the following error::
+When you try to install plone.app.contenttypes < 1.1a1 in a existing site you might get the following error::
(...)
Module Products.GenericSetup.utils, line 509, in _importBody
@@ -372,6 +388,14 @@ When you try to install plone.app.contenttypes in a existing site you might get
Before installing plone.app.contenttypes you have to reinstall plone.app.collection to update collections to the version that uses Dexterity.
+Branches
+========
+
+The master-branch supports Plone 5 only. From this 1.2.x-releases will be cut.
+
+The 1.1.x-branch supports Plone 4.3.x. From this 1.1.x-releases will be cut.
+
+
License
=======
diff --git a/plone/app/contenttypes/browser/templates/archetypes_warning_viewlet.pt b/plone/app/contenttypes/browser/templates/archetypes_warning_viewlet.pt
index bcac682..0d49ce9 100644
--- a/plone/app/contenttypes/browser/templates/archetypes_warning_viewlet.pt
+++ b/plone/app/contenttypes/browser/templates/archetypes_warning_viewlet.pt
@@ -1,3 +1,4 @@
+<tal:available condition="view/available">
<dl class="portalMessage alert-box secondary warning"
i18n:domain="plone">
<dt i18n:translate="">Warning</dt>
@@ -17,4 +18,5 @@
<style type="text/css">
#contentview-edit {display: None;}
-</style>
\ No newline at end of file
+</style>
+</tal:available>
\ No newline at end of file
diff --git a/plone/app/contenttypes/browser/viewlets.py b/plone/app/contenttypes/browser/viewlets.py
index 32772a7..2b58ba3 100644
--- a/plone/app/contenttypes/browser/viewlets.py
+++ b/plone/app/contenttypes/browser/viewlets.py
@@ -23,6 +23,20 @@ def update(self):
if not HAS_ARCHETYPES:
return
self.context = aq_inner(self.context)
+ replaced_types = [
+ 'ATFolder',
+ 'ATDocument',
+ 'ATFile',
+ 'ATImage',
+ 'ATNewsItem',
+ 'ATLink',
+ 'ATEvent',
+ 'ATBlobImage',
+ 'ATBlobFile',
+ 'Collection'
+ ]
+ if self.context.meta_type not in replaced_types:
+ return
if not IBaseObject.providedBy(self.context):
return
context_fti = self.context.getTypeInfo()
diff --git a/plone/app/contenttypes/profiles/default/types/Collection.xml b/plone/app/contenttypes/profiles/default/types/Collection.xml
index c51276f..1b067b4 100644
--- a/plone/app/contenttypes/profiles/default/types/Collection.xml
+++ b/plone/app/contenttypes/profiles/default/types/Collection.xml
@@ -11,8 +11,11 @@
<property name="filter_content_types">False</property>
<property name="allowed_content_types" />
<property name="allow_discussion">False</property>
- <property name="klass">plone.app.contenttypes.content.Collection</property>
<property name="add_permission">plone.app.contenttypes.addCollection</property>
+ <property name="klass">plone.app.contenttypes.content.Collection</property>
+ <property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:collection.xml</property>
<property name="behaviors">
<element value="plone.app.content.interfaces.INameFromTitle"/>
<element value="plone.app.contenttypes.behaviors.collection.ICollection"/>
diff --git a/plone/app/contenttypes/profiles/default/types/Document.xml b/plone/app/contenttypes/profiles/default/types/Document.xml
index 27b774e..61d5f78 100644
--- a/plone/app/contenttypes/profiles/default/types/Document.xml
+++ b/plone/app/contenttypes/profiles/default/types/Document.xml
@@ -19,6 +19,9 @@
<property name="default_view_fallback">False</property>
<property name="add_permission">plone.app.contenttypes.addDocument</property>
<property name="klass">plone.app.contenttypes.content.Document</property>
+ <property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:document.xml</property>
<property name="behaviors">
<element value="plone.app.content.interfaces.INameFromTitle"/>
<element value="plone.app.dexterity.behaviors.discussion.IAllowDiscussion"/>
diff --git a/plone/app/contenttypes/profiles/default/types/Event.xml b/plone/app/contenttypes/profiles/default/types/Event.xml
index 9912e42..08cb111 100644
--- a/plone/app/contenttypes/profiles/default/types/Event.xml
+++ b/plone/app/contenttypes/profiles/default/types/Event.xml
@@ -20,6 +20,8 @@
<!-- Schema, class and security -->
<property name="klass">plone.app.contenttypes.content.Event</property>
<property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:event.xml</property>
<property name="add_permission">plone.app.contenttypes.addEvent</property>
<!-- Enabled behaviors -->
@@ -29,7 +31,6 @@
<element value="plone.app.event.dx.behaviors.IEventLocation"/>
<element value="plone.app.event.dx.behaviors.IEventAttendees"/>
<element value="plone.app.event.dx.behaviors.IEventContact"/>
- <element value="plone.app.event.dx.behaviors.IEventSummary"/>
<element value="plone.app.dexterity.behaviors.metadata.IDublinCore"/>
<element value="plone.app.content.interfaces.INameFromTitle"/>
<element value="plone.app.contenttypes.behaviors.richtext.IRichText"/>
diff --git a/plone/app/contenttypes/profiles/default/types/File.xml b/plone/app/contenttypes/profiles/default/types/File.xml
index 25a5c53..5a073af 100644
--- a/plone/app/contenttypes/profiles/default/types/File.xml
+++ b/plone/app/contenttypes/profiles/default/types/File.xml
@@ -19,6 +19,9 @@
<property name="default_view_fallback">False</property>
<property name="add_permission">plone.app.contenttypes.addFile</property>
<property name="klass">plone.app.contenttypes.content.File</property>
+ <property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:file.xml</property>
<property name="behaviors">
<element value="plone.app.dexterity.behaviors.metadata.ICategorization"/>
<element value="plone.app.dexterity.behaviors.metadata.IPublication"/>
@@ -28,9 +31,6 @@
<element value="plone.app.dexterity.behaviors.exclfromnav.IExcludeFromNavigation"/>
<element value="plone.app.relationfield.behavior.IRelatedItems"/>
</property>
- <property name="schema"></property>
- <property name="model_source"></property>
- <property name="model_file">plone.app.contenttypes.schema:file.xml</property>
<alias from="(Default)" to="@@display-file"/>
<alias from="edit" to="@@edit"/>
<alias from="sharing" to="@@sharing"/>
diff --git a/plone/app/contenttypes/profiles/default/types/Folder.xml b/plone/app/contenttypes/profiles/default/types/Folder.xml
index 1316e6e..758055f 100644
--- a/plone/app/contenttypes/profiles/default/types/Folder.xml
+++ b/plone/app/contenttypes/profiles/default/types/Folder.xml
@@ -23,6 +23,9 @@
<property name="default_view_fallback">False</property>
<property name="add_permission">plone.app.contenttypes.addFolder</property>
<property name="klass">plone.app.contenttypes.content.Folder</property>
+ <property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:folder.xml</property>
<property name="behaviors">
<element value="plone.app.dexterity.behaviors.metadata.IDublinCore"/>
<element value="plone.app.content.interfaces.INameFromTitle"/>
@@ -33,9 +36,6 @@
<element value="plone.app.relationfield.behavior.IRelatedItems"/>
<element value="plone.app.dexterity.behaviors.nextprevious.INextPreviousToggle"/>
</property>
- <property name="schema"></property>
- <property name="model_source"></property>
- <property name="model_file">plone.app.contenttypes.schema:folder.xml</property>
<alias from="(Default)" to="(dynamic view)"/>
<alias from="edit" to="@@edit"/>
<alias from="sharing" to="@@sharing"/>
diff --git a/plone/app/contenttypes/profiles/default/types/Image.xml b/plone/app/contenttypes/profiles/default/types/Image.xml
index 0c853ce..78f482e 100644
--- a/plone/app/contenttypes/profiles/default/types/Image.xml
+++ b/plone/app/contenttypes/profiles/default/types/Image.xml
@@ -20,6 +20,9 @@
<property name="default_view_fallback">False</property>
<property name="add_permission">plone.app.contenttypes.addImage</property>
<property name="klass">plone.app.contenttypes.content.Image</property>
+ <property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:image.xml</property>
<property name="behaviors">
<element value="plone.app.dexterity.behaviors.metadata.ICategorization"/>
<element value="plone.app.dexterity.behaviors.metadata.IPublication"/>
@@ -29,9 +32,6 @@
<element value="plone.app.dexterity.behaviors.exclfromnav.IExcludeFromNavigation"/>
<element value="plone.app.relationfield.behavior.IRelatedItems"/>
</property>
- <property name="schema"></property>
- <property name="model_source"></property>
- <property name="model_file">plone.app.contenttypes.schema:image.xml</property>
<alias from="(Default)" to="@@display-file"/>
<alias from="edit" to="@@edit"/>
<alias from="sharing" to="@@sharing"/>
diff --git a/plone/app/contenttypes/profiles/default/types/Link.xml b/plone/app/contenttypes/profiles/default/types/Link.xml
index 909ce96..0e93a14 100644
--- a/plone/app/contenttypes/profiles/default/types/Link.xml
+++ b/plone/app/contenttypes/profiles/default/types/Link.xml
@@ -19,6 +19,9 @@
<property name="default_view_fallback">False</property>
<property name="add_permission">plone.app.contenttypes.addLink</property>
<property name="klass">plone.app.contenttypes.content.Link</property>
+ <property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:link.xml</property>
<property name="behaviors">
<element value="plone.app.dexterity.behaviors.discussion.IAllowDiscussion"/>
<element value="plone.app.dexterity.behaviors.metadata.IDublinCore"/>
@@ -26,9 +29,6 @@
<element value="plone.app.dexterity.behaviors.exclfromnav.IExcludeFromNavigation"/>
<element value="plone.app.versioningbehavior.behaviors.IVersionable" />
</property>
- <property name="schema"></property>
- <property name="model_source"></property>
- <property name="model_file">plone.app.contenttypes.schema:link.xml</property>
<alias from="(Default)" to="(dynamic view)"/>
<alias from="edit" to="@@edit"/>
<alias from="sharing" to="@@sharing"/>
diff --git a/plone/app/contenttypes/profiles/default/types/News_Item.xml b/plone/app/contenttypes/profiles/default/types/News_Item.xml
index 98c986f..1ad76f6 100644
--- a/plone/app/contenttypes/profiles/default/types/News_Item.xml
+++ b/plone/app/contenttypes/profiles/default/types/News_Item.xml
@@ -19,6 +19,9 @@
<property name="default_view_fallback">False</property>
<property name="add_permission">plone.app.contenttypes.addNewsItem</property>
<property name="klass">plone.app.contenttypes.content.NewsItem</property>
+ <property name="schema"></property>
+ <property name="model_source"></property>
+ <property name="model_file">plone.app.contenttypes.schema:news_item.xml</property>
<property name="behaviors">
<element value="plone.app.dexterity.behaviors.metadata.IDublinCore"/>
<element value="plone.app.contenttypes.behaviors.richtext.IRichText"/>
diff --git a/plone/app/contenttypes/schema/collection.xml b/plone/app/contenttypes/schema/collection.xml
new file mode 100644
index 0000000..f76eaf8
--- /dev/null
+++ b/plone/app/contenttypes/schema/collection.xml
@@ -0,0 +1,4 @@
+<model xmlns="http://namespaces.plone.org/supermodel/schema">
+ <schema>
+ </schema>
+</model>
\ No newline at end of file
diff --git a/plone/app/contenttypes/schema/document.xml b/plone/app/contenttypes/schema/document.xml
new file mode 100644
index 0000000..f76eaf8
--- /dev/null
+++ b/plone/app/contenttypes/schema/document.xml
@@ -0,0 +1,4 @@
+<model xmlns="http://namespaces.plone.org/supermodel/schema">
+ <schema>
+ </schema>
+</model>
\ No newline at end of file
diff --git a/plone/app/contenttypes/schema/event.xml b/plone/app/contenttypes/schema/event.xml
new file mode 100644
index 0000000..f76eaf8
--- /dev/null
+++ b/plone/app/contenttypes/schema/event.xml
@@ -0,0 +1,4 @@
+<model xmlns="http://namespaces.plone.org/supermodel/schema">
+ <schema>
+ </schema>
+</model>
\ No newline at end of file
diff --git a/plone/app/contenttypes/schema/news_item.xml b/plone/app/contenttypes/schema/news_item.xml
new file mode 100644
index 0000000..f76eaf8
--- /dev/null
+++ b/plone/app/contenttypes/schema/news_item.xml
@@ -0,0 +1,4 @@
+<model xmlns="http://namespaces.plone.org/supermodel/schema">
+ <schema>
+ </schema>
+</model>
\ No newline at end of file
diff --git a/plone/app/contenttypes/setuphandlers.py b/plone/app/contenttypes/setuphandlers.py
index b49db56..cfb6e86 100644
--- a/plone/app/contenttypes/setuphandlers.py
+++ b/plone/app/contenttypes/setuphandlers.py
@@ -384,7 +384,7 @@ def _delete_at_example_content(portal):
]
if not [i.id for i in all_content] == expected:
return
- to_delete = ['front-page', 'news', 'events']
+ to_delete = ['front-page', 'news', 'events', 'Members']
for i in to_delete:
obj = portal[i]
if IDexterityContent.providedBy(obj):
diff --git a/plone/app/contenttypes/upgrades.py b/plone/app/contenttypes/upgrades.py
index 8d3d81f..3b44de4 100644
--- a/plone/app/contenttypes/upgrades.py
+++ b/plone/app/contenttypes/upgrades.py
@@ -47,7 +47,6 @@ def update_fti(context):
def enable_collection_behavior(context):
"""Enable collection behavior on Collection.
"""
- # Document
fti = queryUtility(
IDexterityFTI,
name='Collection'
@@ -55,15 +54,15 @@ def enable_collection_behavior(context):
behavior = 'plone.app.contenttypes.behaviors.collection.ICollection'
if behavior in fti.behaviors:
return
- new = list(fti.behaviors)
- new.append(behavior)
- fti.behaviors = tuple(new)
- if fti.schema == 'plone.app.contenttypes.interfaces.ICollection':
- fti.schema = None
+ behaviors = list(fti.behaviors)
+ behaviors.append(behavior)
+ behaviors = tuple(behaviors)
+ fti._updateProperty('behaviors', behaviors)
def migrate_to_richtext(context):
- # add RichText behaviors:
+ """update fti's to add RichText behaviors and remove old text-fields"""
+
context.runImportStepFromProfile(
'profile-plone.app.contenttypes:default',
'typeinfo',
diff --git a/setup.py b/setup.py
index c0d2ec6..4341202 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = '1.1a2.dev0'
+version = '1.1b2.dev0'
long_description = open("README.rst").read() + "\n" + \
open("CHANGES.rst").read()
diff --git a/test-plone-4.3.x.cfg b/test-plone-4.3.x.cfg
index d539362..17fb823 100644
--- a/test-plone-4.3.x.cfg
+++ b/test-plone-4.3.x.cfg
@@ -114,6 +114,9 @@ robotframework-selenium2screenshots = 0.4.0
sphinxcontrib-robotframework = 0.4.3
Pygments = 1.6
+# misc
+pytz = 2013.9
+
[robot]
recipe = zc.recipe.egg
eggs =
diff --git a/travis.cfg b/travis.cfg
index 361547a..6130f96 100644
--- a/travis.cfg
+++ b/travis.cfg
@@ -4,6 +4,8 @@ parts =
download
install
test
+# code-analysis
+# createcoverage
eggs-directory = buildout-cache/eggs
download-cache = buildout-cache/downloads
@@ -14,5 +16,13 @@ url = https://launchpad.net/plone/4.3/4.3.2/+download/Plone-4.3.2-UnifiedInstall
[install]
recipe = collective.recipe.cmd
on_install = true
-cmds = tar jxvf ${download:location}/Plone-4.3-2-UnifiedInstaller/packages/buildout-cache.tar.bz2 1>/dev/null
+cmds = tar jxvf ${download:location}/Plone-4.3.2-UnifiedInstaller/packages/buildout-cache.tar.bz2 1>/dev/null
+
+[code-analysis]
+recipe = plone.recipe.codeanalysis
+directory = ${buildout:directory}/plone/app/contenttypes
+
+[createcoverage]
+recipe = zc.recipe.egg
+eggs = createcoverage
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 63633 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140221/3a1d682a/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 134264 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140221/3a1d682a/attachment-0003.obj>
More information about the Testbot
mailing list