Changeset 3998


Ignore:
Timestamp:
5 Mar 2009, 11:39:58 (16 years ago)
Author:
Henrik Bettermann
Message:

fix 2

Location:
WAeUP_SRP/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/Widgets.py

    r3997 r3998  
    15061506                        break
    15071507                try:
    1508                     student.getContent().makeStudentMember(s_id,password=b)
     1508                    student.getContent().makeStudentMember(s_id,password=n)
    15091509                    s_logger.info('%s/%s has been created using PIN %s' % (s_id,ref,pin_str))
    15101510                except:

  • WAeUP_SRP/trunk/profiles/default/layouts/student_change_password.xml

    r3689 r3998  
    11<?xml version="1.0"?>
    22<?xml-stylesheet type="text/xsl" href="layout.xsl"?>
    3 <object name="student_password_change" meta_type="CPS Layout">
    4   <property name="layout_create_method"></property>
    5   <property name="layout_edit_method"></property>
    6   <property name="layout_view_method"></property>
    7   <property name="style_prefix">layout_waeup_</property>
    8   <property name="flexible_widgets"/>
    9   <property name="validate_values_expr"></property>
    10   <widget name="old_password" meta_type="Password Widget">
    11     <property name="title">Old Password</property>
    12     <property name="fields">
    13       <element value="old_password"/>
    14     </property>
    15     <property name="is_required">True</property>
    16     <property name="label">Old Password</property>
    17     <property name="label_edit">Old Password</property>
    18     <property name="readonly_layout_modes"/>
    19     <property name="hidden_layout_modes"/>
    20     <property name="hidden_readonly_layout_modes"/>
    21     <property name="password_widget"></property>
    22     <property name="check_digit">False</property>
    23     <property name="size_min">3</property>
    24     <property name="size_max">10</property>
    25   </widget>
    26   <widget name="password" meta_type="Password Widget">
    27     <property name="title">New Password</property>
    28     <property name="fields">
    29       <element value="password"/>
    30     </property>
    31     <property name="label">New Password</property>
    32     <property name="label_edit">New Password</property>
    33     <property name="readonly_layout_modes"/>
    34     <property name="hidden_layout_modes"/>
    35     <property name="hidden_readonly_layout_modes"/>
    36     <property name="password_widget"></property>
    37     <property name="check_digit">True</property>
    38     <property name="size_min">6</property>
    39     <property name="size_max">10</property>
    40   </widget>
    41   <widget name="repeat_password" meta_type="Password Widget">
    42     <property name="title">Repeat Password</property>
    43     <property name="fields">
    44       <element value="repeat_password"/>
    45     </property>
    46     <property name="is_required">True</property>
    47     <property name="label">Repeat Password</property>
    48     <property name="label_edit">Repeat Password</property>
    49     <property name="readonly_layout_modes"/>
    50     <property name="hidden_layout_modes"/>
    51     <property name="hidden_readonly_layout_modes"/>
    52     <property name="password_widget">password</property>
    53     <property name="check_digit">True</property>
    54     <property name="size_min">6</property>
    55     <property name="size_max">10</property>
    56   </widget>
    57   <table>
    58     <row>
    59       <cell name="old_password"/>
    60     </row>
    61     <row>
    62       <cell name="password"/>
    63     </row>
    64     <row>
    65       <cell name="repeat_password"/>
    66     </row>
    67   </table>
     3<object name="student_change_password" meta_type="CPS Layout">
     4 <property name="layout_create_method"></property>
     5 <property name="layout_edit_method"></property>
     6 <property name="layout_view_method"></property>
     7 <property name="style_prefix">layout_waeup_</property>
     8 <property name="flexible_widgets"/>
     9 <property name="validate_values_expr"></property>
     10 <property name="label"></property>
     11 <property name="label_edit"></property>
     12 <property name="is_i18n">False</property>
     13 <widget name="old_password" meta_type="Password Widget">
     14  <property name="title">Old Password</property>
     15  <property name="fields">
     16   <element value="old_password"/>
     17  </property>
     18  <property name="is_required">True</property>
     19  <property name="label">Old Password</property>
     20  <property name="label_edit">Old Password</property>
     21  <property name="readonly_layout_modes"/>
     22  <property name="hidden_layout_modes"/>
     23  <property name="hidden_readonly_layout_modes"/>
     24  <property name="display_width">12</property>
     25  <property name="size_min">1</property>
     26  <property name="size_max">12</property>
     27 </widget>
     28 <widget name="password" meta_type="Password Widget">
     29  <property name="title">New Password</property>
     30  <property name="fields">
     31   <element value="password"/>
     32  </property>
     33  <property name="label">New Password</property>
     34  <property name="label_edit">New Password</property>
     35  <property name="readonly_layout_modes"/>
     36  <property name="hidden_layout_modes"/>
     37  <property name="hidden_readonly_layout_modes"/>
     38  <property name="size_min">6</property>
     39  <property name="size_max">10</property>
     40  <property name="check_digit">True</property>
     41 </widget>
     42 <widget name="repeat_password" meta_type="Password Widget">
     43  <property name="title">Repeat Password</property>
     44  <property name="fields">
     45   <element value="repeat_password"/>
     46  </property>
     47  <property name="is_required">True</property>
     48  <property name="label">Repeat Password</property>
     49  <property name="label_edit">Repeat Password</property>
     50  <property name="readonly_layout_modes"/>
     51  <property name="hidden_layout_modes"/>
     52  <property name="hidden_readonly_layout_modes"/>
     53  <property name="size_min">6</property>
     54  <property name="size_max">10</property>
     55  <property name="password_widget">password</property>
     56  <property name="check_digit">True</property>
     57 </widget>
     58 <table>
     59  <row>
     60   <cell name="old_password"/>
     61  </row>
     62  <row>
     63   <cell name="password"/>
     64  </row>
     65  <row>
     66   <cell name="repeat_password"/>
     67  </row>
     68 </table>
    6869</object>
     70

  • WAeUP_SRP/trunk/skins/cps_custom/logged_in.py

    r3972 r3998  
    177177                    p = res[0].pin
    178178                    if len(p) > 10:
    179                         pin = "%s-%s-%s" % (p[:3],p[3:4],p[4:])
     179                        if p.startswith('IPTP'):
     180                            pin = "%s-%s-%s" % (p[:4],p[4:5],p[5:])
     181                        else:
     182                            pin = "%s-%s-%s" % (p[:3],p[3:4],p[4:])
    180183                    else:
    181184                        pin = p
    … …  
    188191
    189192        elif s_review_state in ("admitted") and a_review_state == 'opened' and\
    190                                             not app_doc.app_ac_pin:
     193                                            (not app_doc.app_ac_pin or app_doc.app_ac_pin.startswith('IPT-P')):
    191194            jamb_reg_no = app_doc.jamb_reg_no
    192195            for reg_no in (jamb_reg_no,jamb_reg_no.lower(),jamb_reg_no.upper()):
    … …  
    197200                p = res[0].pin
    198201                if len(p) > 10:
    199                     pin = "%s-%s-%s" % (p[:3],p[3:4],p[4:])
     202                    if p.startswith('IPTP'):
     203                        pin = "%s-%s-%s" % (p[:4],p[4:5],p[5:])
     204                    else:
     205                        pin = "%s-%s-%s" % (p[:3],p[3:4],p[4:])                   
    200206                else:
    201207                    pin = p
Note: See TracChangeset for help on using the changeset viewer.