Changeset 1752

Timestamp:

8 May 2007, 07:38:10 (18 years ago)

Author:

joachim

Message:

create -> add /import

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTool.py (modified) (4 diffs)
• profiles/default/layouts/student_session_results_search.xml (modified) (1 diff)
• profiles/default/layouts/student_study_course.xml (modified) (2 diffs)
• skins/waeup_student/add_student.py (modified) (1 diff)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -252 +252 @@
     ###)
 
-    security.declareProtected(ModifyPortalContent,'createStudent') ###(
-    def createStudent(self,dict):
+    security.declareProtected(ModifyPortalContent,'addStudent') ###(
+    def addStudent(self,dict):
         students_folder = self.portal_url.getPortalObject().campus.students
         sid = self.waeup_tool.generateStudentId('?')
@@ -696 +696 @@
     ###)
 
-    security.declareProtected(ModifyPortalContent,'create_student') ###(
-    def create_student(self,dict):
+    security.declareProtected(ModifyPortalContent,'import_student') ###(
+    def import_student(self,dict):
         "create a students data"
         logger = logging.getLogger('WAeUPTool.create_student')
@@ -729 +729 @@
             sub_doc.edit(mapping = d)
             self.portal_workflow.doActionFor(sub_obj,'close',dest_container=sub_obj)
-##        entry_session = dict.get('entry_session')
-##        wfaction = 'return'
-##        if entry_session == self.getSessionId():
-##            wfaction = 'admit'
-##        self.portal_workflow.doActionFor(student_obj,wfaction)
+        wfaction = 'return'
+        self.portal_workflow.doActionFor(student_obj,wfaction)
         student_obj.manage_setLocalRoles(sid, ['Owner',])
         return sid,''
@@ -763 +760 @@
         for widget in layout.keys():
             validators[widget] = layout[widget].validate
-        creator = getattr(self, 'create_%s' % name,None)
+        creator = getattr(self, 'import_%s' % name,None)
         if creator is None:
             logger.error('No creator function create_%s' % name)

WAeUP_SRP/trunk/profiles/default/layouts/student_session_results_search.xml

@@ -107 +107 @@
  <widget name="secret" meta_type="Secret Widget">
   <property name="title">Secret Widget</property>
+  <property name="fields">
+   <element value="secret"/>
+  </property>
   <property name="check_fields">
    <element value="Firstname"/>

WAeUP_SRP/trunk/profiles/default/layouts/student_study_course.xml

@@ -19 +19 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="current_session" meta_type="Select Widget">
+  <property name="title">Current Study session</property>
+  <property name="fields">
+   <element value="current_session"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Current Session</property>
+  <property name="label_edit">Current Session</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">sessions</property>
  </widget>
  <widget name="current_level" meta_type="Select Widget">
@@ -64 +77 @@
   </row>
   <row>
+   <cell name="current_session"/>
+  </row>
+  <row>
    <cell name="current_verdict"/>
   </row>

WAeUP_SRP/trunk/skins/waeup_student/add_student.py

@@ -62 +62 @@
 dict = {}
 dict.update(ds)
-sid,password = context.waeup_tool.createStudent(dict)
+sid,password = context.waeup_tool.addStudent(dict)
 dict['sid'] = sid
 dict['password'] = password