cubicweb: comparison hooks/workflow.py

equal deleted inserted replaced

-:f7709d28fb79
+:5238d9a8dfee
 :license: GNU Lesser General Public License, v2.1 - http://www.gnu.org/licenses
 """
 __docformat__ = "restructuredtext en"
 from datetime import datetime
+from yams.schema import role_name
 from cubicweb import RepositoryError, ValidationError
 from cubicweb.interfaces import IWorkflowable
 from cubicweb.selectors import implements
 from cubicweb.server import hook
 # transaction
 mainwf = entity.main_workflow
 if mainwf.eid == self.wfeid:
 deststate = mainwf.initial
 if not deststate:
+qname = role_name('custom_workflow', 'subject')
 msg = session._('workflow has no initial state')
-raise ValidationError(entity.eid, {'custom_workflow': msg})
+raise ValidationError(entity.eid, {qname: msg})
 if mainwf.state_by_eid(entity.current_state.eid):
 # nothing to do
 return
 # if there are no history, simply go to new workflow's initial state
 if not entity.workflow_history:
 def precommit_event(self):
 tr = self.session.entity_from_eid(self.treid)
 outputs = set()
 for ep in tr.subworkflow_exit:
 if ep.subwf_state.eid in outputs:
+qname = role_name('subworkflow_exit', 'subject')
 msg = self.session._("can't have multiple exits on the same state")
-raise ValidationError(self.treid, {'subworkflow_exit': msg})
+raise ValidationError(self.treid, {qname: msg})
 outputs.add(ep.subwf_state.eid)
 class _SubWorkflowExitOp(hook.Operation):
 trinfo = self.trinfo
 # we're in a subworkflow, check if we've reached an exit point
 wftr = forentity.subworkflow_input_transition()
 if wftr is None:
 # inconsistency detected
+qname = role_name('to_state', 'subject')
 msg = session._("state doesn't belong to entity's current workflow")
 raise ValidationError(self.trinfo.eid, {'to_state': msg})
 tostate = wftr.get_exit_point(forentity, trinfo['to_state'])
 if tostate is not None:
 # reached an exit point
 entity = self.entity
 # first retreive entity to which the state change apply
 try:
 foreid = entity['wf_info_for']
 except KeyError:
+qname = role_name('wf_info_for', 'subject')
 msg = session._('mandatory relation')
-raise ValidationError(entity.eid, {'wf_info_for': msg})
+raise ValidationError(entity.eid, {qname: msg})
 forentity = session.entity_from_eid(foreid)
 # then check it has a workflow set, unless we're in the process of changing
 # entity's workflow
 if session.transaction_data.get((forentity.eid, 'customwf')):
 wfeid = session.transaction_data[(forentity.eid, 'customwf')]
 treid = entity['by_transition']
 except KeyError:
 # no transition set, check user is a manager and destination state
 # is specified (and valid)
 if not cowpowers:
+qname = role_name('by_transition', 'subject')
 msg = session._('mandatory relation')
-raise ValidationError(entity.eid, {'by_transition': msg})
+raise ValidationError(entity.eid, {qname: msg})
 deststateeid = entity.get('to_state')
 if not deststateeid:
+qname = role_name('by_transition', 'subject')
 msg = session._('mandatory relation')
-raise ValidationError(entity.eid, {'by_transition': msg})
+raise ValidationError(entity.eid, {qname: msg})
 deststate = wf.state_by_eid(deststateeid)
 if deststate is None:
+qname = role_name('to_state', 'subject')
 msg = session._("state doesn't belong to entity's workflow")
-raise ValidationError(entity.eid, {'to_state': msg})
+raise ValidationError(entity.eid, {qname: msg})
 else:
 # check transition is valid and allowed, unless we're coming back
 # from subworkflow
 tr = session.entity_from_eid(treid)
 if swtr is None:
+qname = role_name('by_transition', 'subject')
 if tr is None:
 msg = session._("transition doesn't belong to entity's workflow")
-raise ValidationError(entity.eid, {'by_transition': msg})
+raise ValidationError(entity.eid, {qname: msg})
 if not tr.has_input_state(fromstate):
 msg = session._("transition %(tr)s isn't allowed from %(st)s") % {
 'tr': session._(tr.name), 'st': session._(fromstate.name)}
-raise ValidationError(entity.eid, {'by_transition': msg})
+raise ValidationError(entity.eid, {qname: msg})
 if not tr.may_be_fired(foreid):
 msg = session._("transition may not be fired")
-raise ValidationError(entity.eid, {'by_transition': msg})
+raise ValidationError(entity.eid, {qname: msg})
 if entity.get('to_state'):
 deststateeid = entity['to_state']
 if not cowpowers and deststateeid != tr.destination(forentity).eid:
+qname = role_name('by_transition', 'subject')
 msg = session._("transition isn't allowed")
-raise ValidationError(entity.eid, {'by_transition': msg})
+raise ValidationError(entity.eid, {qname: msg})
 if swtr is None:
 deststate = session.entity_from_eid(deststateeid)
 if not cowpowers and deststate is None:
+qname = role_name('to_state', 'subject')
 msg = session._("state doesn't belong to entity's workflow")
-raise ValidationError(entity.eid, {'to_state': msg})
+raise ValidationError(entity.eid, {qname: msg})
 else:
 deststateeid = tr.destination(forentity).eid
 # everything is ok, add missing information on the trinfo entity
 entity['from_state'] = fromstate.eid
 entity['to_state'] = deststateeid
 raise ValidationError(entity.eid, {None: msg})
 for wf in mainwf.iter_workflows():
 if wf.state_by_eid(self.eidto):
 break
 else:
+qname = role_name('in_state', 'subject')
 msg = session._("state doesn't belong to entity's workflow. You may "
 "want to set a custom workflow for this entity first.")
-raise ValidationError(self.eidfrom, {'in_state': msg})
+raise ValidationError(self.eidfrom, {qname: msg})
 if entity.current_workflow and wf.eid != entity.current_workflow.eid:
+qname = role_name('in_state', 'subject')
 msg = session._("state doesn't belong to entity's current workflow")
-raise ValidationError(self.eidfrom, {'in_state': msg})
+raise ValidationError(self.eidfrom, {qname: msg})
 class SetModificationDateOnStateChange(WorkflowHook):
 """update entity's modification date after changing its state"""
 __regid__ = 'wfsyncmdate'

branch	stable
changeset 5030	5238d9a8dfee
parent 4835	13b0b96d7982
child 5056	5de07c77d73f