-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fc] Repository: plone.app.contentrules
Branch: refs/heads/master Date: 2016-07-26T12:35:41+02:00 Author: Stephan Klinger (staeff) <stephan.klinger@freitag.de> Commit: plone/plone.app.contentrules@c142589 Replace docstring mentions of Formlib with z3c.form p.a.contentrules replaced Formlib with z3c.form in version 4.0.5 Formlib was still mentioned in some docstrings, which are hereby replaced with z3c.form Files changed: M CHANGES.rst M plone/app/contentrules/actions/copy.py M plone/app/contentrules/actions/logger.py M plone/app/contentrules/actions/move.py M plone/app/contentrules/actions/notify.py M plone/app/contentrules/conditions/fileextension.py M plone/app/contentrules/conditions/wfstate.py M plone/app/contentrules/conditions/wftransition.py Repository: plone.app.contentrules Branch: refs/heads/master Date: 2016-07-30T15:04:54+02:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/plone.app.contentrules@c8ef1cf Merge pull request #21 from plone/staeff-replace-formlib-mentions Replace docstring mentions of Formlib with z3c.form Files changed: M CHANGES.rst M plone/app/contentrules/actions/copy.py M plone/app/contentrules/actions/logger.py M plone/app/contentrules/actions/move.py M plone/app/contentrules/actions/notify.py M plone/app/contentrules/conditions/fileextension.py M plone/app/contentrules/conditions/wfstate.py M plone/app/contentrules/conditions/wftransition.py
- Loading branch information
Showing
1 changed file
with
297 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,86 +1,328 @@ | ||
| Repository: plone.app.contenttypes | ||
| Repository: plone.app.contentrules | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2016-07-30T11:03:33+05:30 | ||
| Author: prakhar joshi (prakharjoshi) <prakhar126@gmail.com> | ||
| Commit: https://github.com/plone/plone.app.contenttypes/commit/af5b09266b4670ed6a44fe74e3d478b71baa9164 | ||
| Date: 2016-07-26T12:35:41+02:00 | ||
| Author: Stephan Klinger (staeff) <stephan.klinger@freitag.de> | ||
| Commit: https://github.com/plone/plone.app.contentrules/commit/c142589eadc7a0c328a57ba9b59f625c7544a045 | ||
|
|
||
| Fix typos in doc string and readme. | ||
| Replace docstring mentions of Formlib with z3c.form | ||
|
|
||
| p.a.contentrules replaced Formlib with z3c.form in version 4.0.5 | ||
| Formlib was still mentioned in some docstrings, which are hereby | ||
| replaced with z3c.form | ||
|
|
||
| Files changed: | ||
| M docs/README.rst | ||
| M plone/app/contenttypes/migration/migration.py | ||
| M CHANGES.rst | ||
| M plone/app/contentrules/actions/copy.py | ||
| M plone/app/contentrules/actions/logger.py | ||
| M plone/app/contentrules/actions/move.py | ||
| M plone/app/contentrules/actions/notify.py | ||
| M plone/app/contentrules/conditions/fileextension.py | ||
| M plone/app/contentrules/conditions/wfstate.py | ||
| M plone/app/contentrules/conditions/wftransition.py | ||
|
|
||
| diff --git a/docs/README.rst b/docs/README.rst | ||
| index 9bc621b..dff5179 100644 | ||
| --- a/docs/README.rst | ||
| +++ b/docs/README.rst | ||
| @@ -187,7 +187,7 @@ The migration tries to keep most features (including portlets, comments, content | ||
| Migrating only certain types | ||
| ```````````````````````````` | ||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 6204377..2673af4 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -13,6 +13,8 @@ Fixes: | ||
| - Use zope.interface decorator. | ||
| [gforcada] | ||
|
|
||
| +- Replace docstring mentions of Formlib with z3c.form | ||
| + [staeff] | ||
|
|
||
| 4.0.10 (2015-11-26) | ||
| ------------------- | ||
| diff --git a/plone/app/contentrules/actions/copy.py b/plone/app/contentrules/actions/copy.py | ||
| index a173920..fe3d64a 100644 | ||
| --- a/plone/app/contentrules/actions/copy.py | ||
| +++ b/plone/app/contentrules/actions/copy.py | ||
| @@ -139,7 +139,7 @@ class CopyAddFormView(ContentRuleFormWrapper): | ||
| class CopyEditForm(ActionEditForm): | ||
| """An edit form for copy rule actions. | ||
|
|
||
| -There is also a view ``/@@pac_installer`` that allows you to install plone.app.contenttypes without replacing those archetypes-types with the dexterity-types of which there are existing objects in the site. Afterwards it redirects to the migration-form and only the types that you chose to migrate are installed. This allows you to keep certain types as archetypes while migrating others to dexterity (for example if you did heavy customizations of these types and do not have the time to reimplement these features in dexterity. | ||
| +There is also a view ``/@@pac_installer`` that allows you to install plone.app.contenttypes without replacing those archetypes-types with the dexterity-types of which there are existing objects in the site. Afterwards it redirects to the migration-form and only the types that you chose to migrate are installed. This allows you to keep certain types as archetypes while migrating others to dexterity (for example if you did heavy customizations of these types and do not have the time to reimplement these features in dexterity). | ||
| - Formlib does all the magic here. | ||
| + z3c.form does all the magic here. | ||
| """ | ||
| schema = ICopyAction | ||
| label = _(u"Edit Copy Action") | ||
| @@ -148,4 +148,4 @@ class CopyEditForm(ActionEditForm): | ||
|
|
||
|
|
||
| Migrating Topics | ||
| diff --git a/plone/app/contenttypes/migration/migration.py b/plone/app/contenttypes/migration/migration.py | ||
| index 1e1121a..3cae905 100644 | ||
| --- a/plone/app/contenttypes/migration/migration.py | ||
| +++ b/plone/app/contenttypes/migration/migration.py | ||
| @@ -464,7 +464,7 @@ def last_migrate_check(self): | ||
| class CopyEditFormView(ContentRuleFormWrapper): | ||
| - form = CopyEditForm | ||
| \ No newline at end of file | ||
| + form = CopyEditForm | ||
| diff --git a/plone/app/contentrules/actions/logger.py b/plone/app/contentrules/actions/logger.py | ||
| index e7ffea5..1c14469 100644 | ||
| --- a/plone/app/contentrules/actions/logger.py | ||
| +++ b/plone/app/contentrules/actions/logger.py | ||
| @@ -111,7 +111,7 @@ class LoggerAddFormView(ContentRuleFormWrapper): | ||
| class LoggerEditForm(ActionEditForm): | ||
| """An edit form for logger rule actions. | ||
|
|
||
| def migrateCustomAT(fields_mapping, src_type, dst_type, dry_run=False): | ||
| - Formlib does all the magic here. | ||
| + z3c.form does all the magic here. | ||
| """ | ||
| - Try to get types infos from archetype_tool, then set a migrator an pass it | ||
| + Try to get types infos from archetype_tool, then set a migrator and pass it | ||
| given values. There is a dry_run mode that allows to check the success of | ||
| a migration without committing. | ||
| schema = ILoggerAction | ||
| label = _(u"Edit Logger Action") | ||
| @@ -120,4 +120,4 @@ class LoggerEditForm(ActionEditForm): | ||
|
|
||
|
|
||
| class LoggerEditFormView(ContentRuleFormWrapper): | ||
| - form = LoggerAddForm | ||
| \ No newline at end of file | ||
| + form = LoggerAddForm | ||
| diff --git a/plone/app/contentrules/actions/move.py b/plone/app/contentrules/actions/move.py | ||
| index e5ffb16..fa0e083 100644 | ||
| --- a/plone/app/contentrules/actions/move.py | ||
| +++ b/plone/app/contentrules/actions/move.py | ||
| @@ -163,7 +163,7 @@ class MoveAddFormView(ContentRuleFormWrapper): | ||
| class MoveEditForm(ActionEditForm): | ||
| """An edit form for move rule actions. | ||
|
|
||
| - Formlib does all the magic here. | ||
| + z3c.form does all the magic here. | ||
| """ | ||
| schema = IMoveAction | ||
| label = _(u"Edit Move Action") | ||
| @@ -172,4 +172,4 @@ class MoveEditForm(ActionEditForm): | ||
|
|
||
|
|
||
| class MoveEditFormView(ContentRuleFormWrapper): | ||
| - form = MoveEditForm | ||
| \ No newline at end of file | ||
| + form = MoveEditForm | ||
| diff --git a/plone/app/contentrules/actions/notify.py b/plone/app/contentrules/actions/notify.py | ||
| index 0a43443..72861a5 100644 | ||
| --- a/plone/app/contentrules/actions/notify.py | ||
| +++ b/plone/app/contentrules/actions/notify.py | ||
| @@ -82,7 +82,7 @@ class NotifyAddFormView(ContentRuleFormWrapper): | ||
| class NotifyEditForm(ActionEditForm): | ||
| """An edit form for notify rule actions. | ||
|
|
||
| - Formlib does all the magic here. | ||
| + z3c.form does all the magic here. | ||
| """ | ||
| schema = INotifyAction | ||
| label = _(u"Edit Notify Action") | ||
| @@ -91,4 +91,4 @@ class NotifyEditForm(ActionEditForm): | ||
|
|
||
|
|
||
| class NotifyEditFormView(ContentRuleFormWrapper): | ||
| - form = NotifyAddForm | ||
| \ No newline at end of file | ||
| + form = NotifyAddForm | ||
| diff --git a/plone/app/contentrules/conditions/fileextension.py b/plone/app/contentrules/conditions/fileextension.py | ||
| index d49dc7a..2a72cda 100644 | ||
| --- a/plone/app/contentrules/conditions/fileextension.py | ||
| +++ b/plone/app/contentrules/conditions/fileextension.py | ||
| @@ -93,7 +93,7 @@ class FileExtensionAddFormView(ContentRuleFormWrapper): | ||
| class FileExtensionEditForm(EditForm): | ||
| """An edit form for portal type conditions | ||
|
|
||
| - Formlib does all the magic here. | ||
| + z3c.form does all the magic here. | ||
| """ | ||
| schema = IFileExtensionCondition | ||
| label = _(u"Edit File Extension Condition") | ||
| diff --git a/plone/app/contentrules/conditions/wfstate.py b/plone/app/contentrules/conditions/wfstate.py | ||
| index 3f71c8c..fc05cc9 100644 | ||
| --- a/plone/app/contentrules/conditions/wfstate.py | ||
| +++ b/plone/app/contentrules/conditions/wfstate.py | ||
| @@ -81,7 +81,7 @@ class WorkflowStateAddFormView(ContentRuleFormWrapper): | ||
| class WorkflowStateEditForm(EditForm): | ||
| """An edit form for portal type conditions | ||
|
|
||
| - Formlib does all the magic here. | ||
| + z3c.form does all the magic here. | ||
| """ | ||
| schema = IWorkflowStateCondition | ||
| label = _(u"Edit Workflow State Condition") | ||
| diff --git a/plone/app/contentrules/conditions/wftransition.py b/plone/app/contentrules/conditions/wftransition.py | ||
| index ceb026d..aa2736d 100644 | ||
| --- a/plone/app/contentrules/conditions/wftransition.py | ||
| +++ b/plone/app/contentrules/conditions/wftransition.py | ||
| @@ -76,7 +76,7 @@ class WorkflowTransitionAddFormView(ContentRuleFormWrapper): | ||
| class WorkflowTransitionEditForm(EditForm): | ||
| """An edit form for portal type conditions | ||
|
|
||
| - Formlib does all the magic here. | ||
| + z3c.form does all the magic here. | ||
| """ | ||
| schema = IWorkflowTransitionCondition | ||
| label = _(u"Edit Workflow Transition Condition") | ||
| @@ -86,4 +86,4 @@ class WorkflowTransitionEditForm(EditForm): | ||
|
|
||
|
|
||
| class WorkflowTransitionEditFormView(ContentRuleFormWrapper): | ||
| - form = WorkflowTransitionEditForm | ||
| \ No newline at end of file | ||
| + form = WorkflowTransitionEditForm | ||
|
|
||
|
|
||
| Repository: plone.app.contenttypes | ||
| Repository: plone.app.contentrules | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2016-07-30T09:52:42+02:00 | ||
| Author: Philip Bauer (pbauer) <bauer@starzel.de> | ||
| Commit: https://github.com/plone/plone.app.contenttypes/commit/d764045f9a895478aa6316bc01da2ac2fe3f8205 | ||
| Date: 2016-07-30T15:04:54+02:00 | ||
| Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
| Commit: https://github.com/plone/plone.app.contentrules/commit/c8ef1cfa0b81c8b04e642e3896f1644e09bcb879 | ||
|
|
||
| Merge pull request #363 from plone/Fix-typos | ||
| Merge pull request #21 from plone/staeff-replace-formlib-mentions | ||
|
|
||
| Fix typos in doc string and readme. | ||
| Replace docstring mentions of Formlib with z3c.form | ||
|
|
||
| Files changed: | ||
| M docs/README.rst | ||
| M plone/app/contenttypes/migration/migration.py | ||
| M CHANGES.rst | ||
| M plone/app/contentrules/actions/copy.py | ||
| M plone/app/contentrules/actions/logger.py | ||
| M plone/app/contentrules/actions/move.py | ||
| M plone/app/contentrules/actions/notify.py | ||
| M plone/app/contentrules/conditions/fileextension.py | ||
| M plone/app/contentrules/conditions/wfstate.py | ||
| M plone/app/contentrules/conditions/wftransition.py | ||
|
|
||
| diff --git a/docs/README.rst b/docs/README.rst | ||
| index 9bc621b..dff5179 100644 | ||
| --- a/docs/README.rst | ||
| +++ b/docs/README.rst | ||
| @@ -187,7 +187,7 @@ The migration tries to keep most features (including portlets, comments, content | ||
| Migrating only certain types | ||
| ```````````````````````````` | ||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 6204377..2673af4 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -13,6 +13,8 @@ Fixes: | ||
| - Use zope.interface decorator. | ||
| [gforcada] | ||
|
|
||
| -There is also a view ``/@@pac_installer`` that allows you to install plone.app.contenttypes without replacing those archetypes-types with the dexterity-types of which there are existing objects in the site. Afterwards it redirects to the migration-form and only the types that you chose to migrate are installed. This allows you to keep certain types as archetypes while migrating others to dexterity (for example if you did heavy customizations of these types and do not have the time to reimplement these features in dexterity. | ||
| +There is also a view ``/@@pac_installer`` that allows you to install plone.app.contenttypes without replacing those archetypes-types with the dexterity-types of which there are existing objects in the site. Afterwards it redirects to the migration-form and only the types that you chose to migrate are installed. This allows you to keep certain types as archetypes while migrating others to dexterity (for example if you did heavy customizations of these types and do not have the time to reimplement these features in dexterity). | ||
| +- Replace docstring mentions of Formlib with z3c.form | ||
| + [staeff] | ||
|
|
||
| 4.0.10 (2015-11-26) | ||
| ------------------- | ||
| diff --git a/plone/app/contentrules/actions/copy.py b/plone/app/contentrules/actions/copy.py | ||
| index a173920..fe3d64a 100644 | ||
| --- a/plone/app/contentrules/actions/copy.py | ||
| +++ b/plone/app/contentrules/actions/copy.py | ||
| @@ -139,7 +139,7 @@ class CopyAddFormView(ContentRuleFormWrapper): | ||
| class CopyEditForm(ActionEditForm): | ||
| """An edit form for copy rule actions. | ||
|
|
||
| - Formlib does all the magic here. | ||
| + z3c.form does all the magic here. | ||
| """ | ||
| schema = ICopyAction | ||
| label = _(u"Edit Copy Action") | ||
| @@ -148,4 +148,4 @@ class CopyEditForm(ActionEditForm): | ||
|
|
||
|
|
||
| class CopyEditFormView(ContentRuleFormWrapper): | ||
| - form = CopyEditForm | ||
| \ No newline at end of file | ||
| + form = CopyEditForm | ||
| diff --git a/plone/app/contentrules/actions/logger.py b/plone/app/contentrules/actions/logger.py | ||
| index e7ffea5..1c14469 100644 | ||
| --- a/plone/app/contentrules/actions/logger.py | ||
| +++ b/plone/app/contentrules/actions/logger.py | ||
| @@ -111,7 +111,7 @@ class LoggerAddFormView(ContentRuleFormWrapper): | ||
| class LoggerEditForm(ActionEditForm): | ||
| """An edit form for logger rule actions. | ||
|
|
||
| - Formlib does all the magic here. | ||
| + z3c.form does all the magic here. | ||
| """ | ||
| schema = ILoggerAction | ||
| label = _(u"Edit Logger Action") | ||
| @@ -120,4 +120,4 @@ class LoggerEditForm(ActionEditForm): | ||
|
|
||
|
|
||
| class LoggerEditFormView(ContentRuleFormWrapper): | ||
| - form = LoggerAddForm | ||
| \ No newline at end of file | ||
| + form = LoggerAddForm | ||
| diff --git a/plone/app/contentrules/actions/move.py b/plone/app/contentrules/actions/move.py | ||
| index e5ffb16..fa0e083 100644 | ||
| --- a/plone/app/contentrules/actions/move.py | ||
| +++ b/plone/app/contentrules/actions/move.py | ||
| @@ -163,7 +163,7 @@ class MoveAddFormView(ContentRuleFormWrapper): | ||
| class MoveEditForm(ActionEditForm): | ||
| """An edit form for move rule actions. | ||
|
|
||
| - Formlib does all the magic here. | ||
| + z3c.form does all the magic here. | ||
| """ | ||
| schema = IMoveAction | ||
| label = _(u"Edit Move Action") | ||
| @@ -172,4 +172,4 @@ class MoveEditForm(ActionEditForm): | ||
|
|
||
| Migrating Topics | ||
| diff --git a/plone/app/contenttypes/migration/migration.py b/plone/app/contenttypes/migration/migration.py | ||
| index 1e1121a..3cae905 100644 | ||
| --- a/plone/app/contenttypes/migration/migration.py | ||
| +++ b/plone/app/contenttypes/migration/migration.py | ||
| @@ -464,7 +464,7 @@ def last_migrate_check(self): | ||
|
|
||
| def migrateCustomAT(fields_mapping, src_type, dst_type, dry_run=False): | ||
| class MoveEditFormView(ContentRuleFormWrapper): | ||
| - form = MoveEditForm | ||
| \ No newline at end of file | ||
| + form = MoveEditForm | ||
| diff --git a/plone/app/contentrules/actions/notify.py b/plone/app/contentrules/actions/notify.py | ||
| index 0a43443..72861a5 100644 | ||
| --- a/plone/app/contentrules/actions/notify.py | ||
| +++ b/plone/app/contentrules/actions/notify.py | ||
| @@ -82,7 +82,7 @@ class NotifyAddFormView(ContentRuleFormWrapper): | ||
| class NotifyEditForm(ActionEditForm): | ||
| """An edit form for notify rule actions. | ||
|
|
||
| - Formlib does all the magic here. | ||
| + z3c.form does all the magic here. | ||
| """ | ||
| schema = INotifyAction | ||
| label = _(u"Edit Notify Action") | ||
| @@ -91,4 +91,4 @@ class NotifyEditForm(ActionEditForm): | ||
|
|
||
|
|
||
| class NotifyEditFormView(ContentRuleFormWrapper): | ||
| - form = NotifyAddForm | ||
| \ No newline at end of file | ||
| + form = NotifyAddForm | ||
| diff --git a/plone/app/contentrules/conditions/fileextension.py b/plone/app/contentrules/conditions/fileextension.py | ||
| index d49dc7a..2a72cda 100644 | ||
| --- a/plone/app/contentrules/conditions/fileextension.py | ||
| +++ b/plone/app/contentrules/conditions/fileextension.py | ||
| @@ -93,7 +93,7 @@ class FileExtensionAddFormView(ContentRuleFormWrapper): | ||
| class FileExtensionEditForm(EditForm): | ||
| """An edit form for portal type conditions | ||
|
|
||
| - Formlib does all the magic here. | ||
| + z3c.form does all the magic here. | ||
| """ | ||
| - Try to get types infos from archetype_tool, then set a migrator an pass it | ||
| + Try to get types infos from archetype_tool, then set a migrator and pass it | ||
| given values. There is a dry_run mode that allows to check the success of | ||
| a migration without committing. | ||
| schema = IFileExtensionCondition | ||
| label = _(u"Edit File Extension Condition") | ||
| diff --git a/plone/app/contentrules/conditions/wfstate.py b/plone/app/contentrules/conditions/wfstate.py | ||
| index 3f71c8c..fc05cc9 100644 | ||
| --- a/plone/app/contentrules/conditions/wfstate.py | ||
| +++ b/plone/app/contentrules/conditions/wfstate.py | ||
| @@ -81,7 +81,7 @@ class WorkflowStateAddFormView(ContentRuleFormWrapper): | ||
| class WorkflowStateEditForm(EditForm): | ||
| """An edit form for portal type conditions | ||
|
|
||
| - Formlib does all the magic here. | ||
| + z3c.form does all the magic here. | ||
| """ | ||
| schema = IWorkflowStateCondition | ||
| label = _(u"Edit Workflow State Condition") | ||
| diff --git a/plone/app/contentrules/conditions/wftransition.py b/plone/app/contentrules/conditions/wftransition.py | ||
| index ceb026d..aa2736d 100644 | ||
| --- a/plone/app/contentrules/conditions/wftransition.py | ||
| +++ b/plone/app/contentrules/conditions/wftransition.py | ||
| @@ -76,7 +76,7 @@ class WorkflowTransitionAddFormView(ContentRuleFormWrapper): | ||
| class WorkflowTransitionEditForm(EditForm): | ||
| """An edit form for portal type conditions | ||
|
|
||
| - Formlib does all the magic here. | ||
| + z3c.form does all the magic here. | ||
| """ | ||
| schema = IWorkflowTransitionCondition | ||
| label = _(u"Edit Workflow Transition Condition") | ||
| @@ -86,4 +86,4 @@ class WorkflowTransitionEditForm(EditForm): | ||
|
|
||
|
|
||
| class WorkflowTransitionEditFormView(ContentRuleFormWrapper): | ||
| - form = WorkflowTransitionEditForm | ||
| \ No newline at end of file | ||
| + form = WorkflowTransitionEditForm | ||
|
|
||
|
|