Ticket #2463: preliminary_required_fields_change.patch

trac-trunk/trac/ticket/web_ui.py

@@ -1129 +1129 @@
             add_warning(req, _("Tickets must contain a summary."))
             valid = False
             
+        action = req.args.get('action', None)
+        if action == 'leave':
+            action = ticket.values['status']
+
+        if action not in  (None, 'leave', 'new'):
+            # todo - add required fields for 'new', which are the default 
+            # required fields
+            controllers = list(
+                self._get_action_controllers(req, ticket, action))
+            if controllers:
+                action_config = controllers[0].actions.get(action, {})
+                required_fields = action_config.get('required_fields', [])
+                
         # Always validate for known values
         for field in ticket.fields:
+            if field['name'] in required_fields and not field['value']:
+                add_warning(req, _(
+                    '"%(field)s" requires a value for the "%(action)s" action',
+                    field = field['name'], action = action))
+                valid = False
+                
             if 'options' not in field:
                 continue
             if field['name'] == 'status':

trac-trunk/trac/ticket/default_workflow.py

@@ -74 +74 @@
         else:
             attributes['permissions'] = [a.strip() for a in
                                          attributes['permissions'].split(',')]
+        # If no required_fields are specified, then all fields are conditional
+        if 'required_fields' not in attributes:
+            attributes['required_fields'] = []
+        else:
+            attributes['required_fields'] = [
+                a.strip() for a in attributes['required_fields'].split(',')]
+
         # Normalize the oldstates
         attributes['oldstates'] = [x.strip() for x in
                                    attributes['oldstates'].split(',')]