Changeset 1027 for WAeUP_SRP


Ignore:
Timestamp:
11 Dec 2006, 10:28:28 (18 years ago)
Author:
joachim
Message:

corrections which are already in custom folder

Location:
WAeUP_SRP/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/profiles/default/types/ScratchCardBatch.xml

    r770 r1027  
    88 <property name="product">WAeUP_SRP</property>
    99 <property name="factory">addScratchCardBatch</property>
    10  <property name="immediate_view">batch_view</property>
     10 <property name="immediate_view">search_pins</property>
    1111 <property name="global_allow">True</property>
    1212 <property name="filter_content_types">True</property>
    … …  
    2626 <property name="storage_methods"/>
    2727 <property name="cps_is_portlet">False</property>
    28  <alias from="(Default)" to="batch_view"/>
     28 <alias from="(Default)" to="search_pins"/>
    2929 <alias from="create_do" to="scratch_card_batch_create_do"/>
    3030 <alias from="created" to="scratch_card_batch_created"/>
    31  <alias from="view" to="batch_view"/>
     31 <alias from="view" to="search_pins"/>
    3232 <action title="View" action_id="view" category="object"
    33     condition_expr="" url_expr="string:${object_url}/batch_view"
     33    condition_expr="" url_expr="string:${object_url}/search_pins"
    3434    visible="True">
    3535  <permission value="Modify portal content"/>

  • WAeUP_SRP/trunk/skins/waeup_student/application_edit_form.pt

    r1025 r1027  
    11<metal:html tal:define="info context/getStudentInfo">
    22  <span tal:condition="not: info">
    3     <metal:block use-macro="here/error_not_found/macros/not_found" />
     3    <metal:block use-macro="here/illegal_view/macros/illegal_view" />
    44  </span>
    55<metal:block tal:condition="info">

  • WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py

    r1017 r1027  
    5454        if context.isStudent():
    5555           action = "/clearance_edit_form"
     56        if clear_doc.clr_ac_pin == "":
     57            res = context.portal_pins(student=member_id)
     58            if res:
     59                p = res[0].pin
     60                if len(p) > 10:
     61                    pin = "%s-%s-%s" % (p[:3],p[3:4],p[4:])
     62                else:
     63                    pin = p
     64                clear_doc.edit(mapping={'clr_ac_pin': pin})
    5665    elif cpsdocument_edit_and_view_button:
    5766        if acknowledge and info['review_state'] == "clearance_pin_entered":

  • WAeUP_SRP/trunk/skins/waeup_student/start_clearance.py

    r1021 r1027  
    6565dc['lga_ident'] = app_doc.get('jamb_lga')
    6666dc['lga'] = app_doc.get('jamb_state','no state') + ' / ' + app_doc.get('jamb_lga','no lga')
     67dc['clr_ac_pin'] = pin
    6768dc['clr_ac_date'] = current
    6869dc['entry_date'] = current
Note: See TracChangeset for help on using the changeset viewer.