# HG changeset patch # User Sylvain Thénault # Date 1254908754 -7200 # Node ID b7a125f0059ce57bbe380ed67ebfc0530b718358 # Parent 5b3725f315fc692705dc00d82fee90042b874a64# Parent 28547f21308ee689f6dad1772e9f633c02ca8b15 merge diff -r 5b3725f315fc -r b7a125f0059c doc/book/en/conf.py --- a/doc/book/en/conf.py Wed Oct 07 11:45:39 2009 +0200 +++ b/doc/book/en/conf.py Wed Oct 07 11:45:54 2009 +0200 @@ -49,9 +49,9 @@ # other places throughout the built documents. # # The short X.Y version. -version = '0.54' +version = '3.5' # The full version, including alpha/beta/rc tags. -release = '3.4' +release = '3.5' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: diff -r 5b3725f315fc -r b7a125f0059c doc/book/en/development/datamodel/definition.rst --- a/doc/book/en/development/datamodel/definition.rst Wed Oct 07 11:45:39 2009 +0200 +++ b/doc/book/en/development/datamodel/definition.rst Wed Oct 07 11:45:54 2009 +0200 @@ -74,7 +74,7 @@ function `_` to be properly internationalized. - `constraints` : a list of conditions/constraints that the relation has to - satisfy (c.f. `Contraints`_) + satisfy (c.f. `Constraints`_) - `cardinality` : a two character string which specify the cardinality of the relation. The first character defines the cardinality of the relation on diff -r 5b3725f315fc -r b7a125f0059c doc/book/en/development/devcore/vreg.rst --- a/doc/book/en/development/devcore/vreg.rst Wed Oct 07 11:45:39 2009 +0200 +++ b/doc/book/en/development/devcore/vreg.rst Wed Oct 07 11:45:54 2009 +0200 @@ -138,7 +138,7 @@ selectable. For an rset with one entity, the EntityRSSIconBox class will have a higher score then RSSIconBox, which is what we wanted. -Of course, once this is done, you have to :: +Of course, once this is done, you have to: * fill in the call method of EntityRSSIconBox @@ -161,7 +161,7 @@ (or did not) is the way. There exists a traced_selection context manager to help with that. -Here is an example :: +Here is an example: .. sourcecode:: python diff -r 5b3725f315fc -r b7a125f0059c doc/book/en/development/devrepo/operations.rst --- a/doc/book/en/development/devrepo/operations.rst Wed Oct 07 11:45:39 2009 +0200 +++ b/doc/book/en/development/devrepo/operations.rst Wed Oct 07 11:45:54 2009 +0200 @@ -25,9 +25,10 @@ commit) * rollback: the transaction has been either rollbacked either - * intentionaly - * a precommit event failed, all operations are rollbacked - * a commit event failed, all operations which are not been triggered + + - intentionaly + - a precommit event failed, all operations are rollbacked + - a commit event failed, all operations which are not been triggered for commit are rollbacked Exceptions signaled from within a rollback are logged and swallowed. diff -r 5b3725f315fc -r b7a125f0059c doc/book/en/development/devweb/internationalization.rst --- a/doc/book/en/development/devweb/internationalization.rst Wed Oct 07 11:45:39 2009 +0200 +++ b/doc/book/en/development/devweb/internationalization.rst Wed Oct 07 11:45:54 2009 +0200 @@ -2,7 +2,6 @@ .. _internationalization: - Internationalization --------------------- diff -r 5b3725f315fc -r b7a125f0059c doc/book/en/development/devweb/js.rst --- a/doc/book/en/development/devweb/js.rst Wed Oct 07 11:45:39 2009 +0200 +++ b/doc/book/en/development/devweb/js.rst Wed Oct 07 11:45:54 2009 +0200 @@ -24,7 +24,7 @@ XXX external_resources variable (which needs love) CubicWeb javascript api -~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~ Javascript resources are typically loaded on demand, from views. The request object (available as self.req from most application objects, diff -r 5b3725f315fc -r b7a125f0059c doc/book/en/development/devweb/rtags.rst --- a/doc/book/en/development/devweb/rtags.rst Wed Oct 07 11:45:39 2009 +0200 +++ b/doc/book/en/development/devweb/rtags.rst Wed Oct 07 11:45:54 2009 +0200 @@ -4,11 +4,11 @@ The "Relation tags" structure ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. automodule:: `cubicweb.rtags` +.. automodule:: cubicweb.rtags :members: The `uicfg` module (:mod:`cubicweb.web.uicfg`) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. automodule:: `cubicweb.web.uicfg` +.. automodule:: cubicweb.web.uicfg :members: diff -r 5b3725f315fc -r b7a125f0059c entities/wfobjs.py --- a/entities/wfobjs.py Wed Oct 07 11:45:39 2009 +0200 +++ b/entities/wfobjs.py Wed Oct 07 11:45:54 2009 +0200 @@ -137,7 +137,7 @@ return tr def add_wftransition(self, name, subworkflow, fromstates, exitpoints, - requiredgroups=(), conditions=(), **kwargs): + requiredgroups=(), conditions=(), **kwargs): """add a workflow transition to this workflow""" tr = self._add_transition('WorkflowTransition', name, fromstates, requiredgroups, conditions, **kwargs) diff -r 5b3725f315fc -r b7a125f0059c server/migractions.py --- a/server/migractions.py Wed Oct 07 11:45:39 2009 +0200 +++ b/server/migractions.py Wed Oct 07 11:45:54 2009 +0200 @@ -966,6 +966,21 @@ def cmd_add_workflow(self, name, wfof, default=True, commit=False, **kwargs): + """ + create a new workflow and links it to entity types + :type name: unicode + :param name: name of the workflow + + :type wfof: string or list/tuple of strings + :param wfof: entity type(s) having this workflow + + :type default: bool + :param default: tells wether this is the default workflow + for the specified entity type(s); set it to false in + the case of a subworkflow + + :rtype: `Workflow` + """ self.session.set_pool() # ensure pool is set wf = self.cmd_create_entity('Workflow', name=unicode(name), **kwargs) diff -r 5b3725f315fc -r b7a125f0059c sobjects/notification.py --- a/sobjects/notification.py Wed Oct 07 11:45:39 2009 +0200 +++ b/sobjects/notification.py Wed Oct 07 11:45:54 2009 +0200 @@ -16,7 +16,7 @@ from cubicweb import RegistryException from cubicweb.selectors import implements, yes from cubicweb.view import Component -from cubicweb.common.mail import NotificationView, parse_message_id +from cubicweb.common.mail import NotificationView, parse_message_id, SkipEmail from cubicweb.server.pool import PreCommitOperation, SingleLastOperation from cubicweb.server.hookhelper import SendMailOp from cubicweb.server.hooksmanager import Hook