Changeset 1385

Show
Ignore:
Timestamp:
01/21/11 17:54:33 (16 months ago)
Author:
zeank
Message:

make adding/editing answer definitions work
refs #251

Location:
HelpIM3/branches/chatgroups/HelpIM/questionair/pages
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • HelpIM3/branches/chatgroups/HelpIM/questionair/pages/AnswerDefinitionEditor.py

    r1384 r1385  
    3636                             } 
    3737    def validate(self, *pargs, **kwargs): 
    38         errors = [] 
    39          
    40         if not self.parameters.has_key('fcAnswer_code') or len(self.parameters['fcAnswer_code']) == 0: 
    41             self.errors.append({'fcAnswer_code': 'De code is verplicht'}) 
    42          
    43         if not self.parameters.has_key('fcAnswer_text') or len(self.parameters['fcAnswer_text']) == 0: 
    44             self.errors.append({'fcAnswer_text': 'De antwoord-tekst is verplicht'}) 
    45         self.log.debug('validate() errors : %s' % errors) 
    46         return errors 
    47  
     38        self.checkNotEmpty('fcAnswer_code', 'De code is verplicht') 
     39        self.checkNotEmpty('fcAnswer_text', 'De antwoord-tekst is verplicht') 
     40        self.checkNotEmpty('fcAnswer_action', 'You need to choose an action') 
    4841 
    4942    def getPanelData(self, *pargs, **kwargs): 

  • HelpIM3/branches/chatgroups/HelpIM/questionair/pages/QuestionEditor.py

    r1383 r1385  
    276276                self.addError('question_type', 'question_type %s unknown' % self.getParam('question_type')) 
    277277 
    278         if self.checkParam('__function__', 'AddAnswerDefinition'): 
    279             self.checkNotEmpty('fcAnswer_code', 'De code is verplicht') 
    280             self.checkNotEmpty('fcAnswer_text', 'De text is verplicht') 
    281  
    282278    def panelDataToObject(self, *pargs, **kwargs): 
    283279        self.log.debug('.panelDataToObject()')