Changeset 6696

Timestamp:

9 Sep 2011, 07:11:53 (13 years ago)

Author:

Henrik Bettermann

Message:

Add reg_number attribute which is needed for first-time login (admission checking).

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• browser.py (modified) (1 diff)
• catalog.py (modified) (3 diffs)
• interfaces.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -477 +477 @@
     grok.name('bedit')
     grok.require('waeup.handleStudent')
-    form_fields = grok.AutoFields(IStudentBaseEdit).omit('student_id')
+    form_fields = grok.AutoFields(IStudentBaseEdit).omit(
+        'student_id', 'reg_number')
     grok.template('baseeditpage')
     label = 'Change password'

main/waeup.sirp/trunk/src/waeup/sirp/students/catalog.py

@@ -18 +18 @@
     student_id = index.Field(attribute='student_id')
     name = index.Text(attribute='name')
-    #history = index.Text(attribute='history')
-    #state = index.Field(attribute='state')
+    reg_number = index.Field(attribute='reg_number')
+    state = index.Field(attribute='state')
 
 class StudentQueryResultItem(object):
@@ -32 +32 @@
         self.student_id = context.student_id
         self.name = context.name
-        #self.history = context.history
-        #self.state = context.state
+        self.reg_number = context.reg_number
+        self.state = context.state
 
 def search(query=None, searchtype=None, view=None):
@@ -40 +40 @@
     #    view.flash('Empty search string.')
     #    return
-    if searchtype in ('history','name'):
+    if searchtype in ('name',):
         results = Query().searchResults(
             Text(('students_catalog', searchtype), query))

main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py

@@ -80 +80 @@
     password = schema.Password(
         title = u'Password',
+        required = False,
+        )
+
+    reg_number = schema.TextLine(
+        title = u'Registration Number',
+        default = u'',
+        required = True,
+        readonly = False,
         )
 
@@ -144 +152 @@
         )
 
+    password = schema.Password(
+        title = u'Password',
+        required = True,
+        )
+
 IStudentBaseEdit['name'].order =  IStudentBase['name'].order