Changeset 1952

Timestamp:

23 Jun 2007, 21:44:30 (17 years ago)

Author:

Henrik Bettermann

Message:

members_search.xml: labels in members search form corrected
getPaymentsFolderInfo.py: show requery link only in state cleared_adn_validated

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/layouts/members_search.xml (modified) (5 diffs)
• skins/waeup_epayment/getPaymentsFolderInfo.py (modified) (1 diff)

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

@@ -1 +1 @@
 <?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="layout.xsl"?>
 <object name="members_search" meta_type="CPS Layout">
  <property name="layout_create_method"></property>
@@ -21 +20 @@
    <element value="givenName"/>
   </property>
-  <property name="label">label_first_name</property>
-  <property name="label_edit">label_first_name</property>
+  <property name="label">Firstname</property>
+  <property name="label_edit">Firstname</property>
   <property name="description">Member first name</property>
   <property name="is_i18n">True</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="groups" meta_type="MultiSelect Widget">
+  <property name="title">Groups</property>
+  <property name="fields">
+   <element value="groups"/>
+  </property>
+  <property name="label">Groups</property>
+  <property name="label_edit">Groups</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">groups_voc</property>
  </widget>
  <widget name="id" meta_type="String Widget">
@@ -30 +44 @@
    <element value="id"/>
   </property>
-  <property name="label">label_user_name</property>
-  <property name="label_edit">label_user_name</property>
+  <property name="label">User name</property>
+  <property name="label_edit">User name</property>
   <property name="description">Member login</property>
   <property name="is_i18n">True</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
  </widget>
  <widget name="sn" meta_type="String Widget">
@@ -39 +56 @@
    <element value="sn"/>
   </property>
-  <property name="label">label_last_name</property>
-  <property name="label_edit">label_last_name</property>
+  <property name="label">Lastname</property>
+  <property name="label_edit">Lastname</property>
   <property name="description">Member last name</property>
   <property name="is_i18n">True</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
  </widget>
-  <widget name="groups" meta_type="MultiSelect Widget">
-    <property name="title">Groups</property>
-    <property name="fields">
-      <element value="groups"/>
-    </property>
-    <property name="label">Groups</property>
-    <property name="label_edit">Groups</property>
-    <property name="readonly_layout_modes"/>
-    <property name="hidden_layout_modes"/>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="vocabulary">groups_voc</property>
-  </widget>
  <table>
   <row>
@@ -72 +80 @@
  </table>
 </object>
+

WAeUP_SRP/trunk/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -78 +78 @@
     row['trans_ref'] = getattr(so_doc,'order_id','')
     if so_doc.type_description.startswith('School Fee'):
-        if review_state == 'opened' and hasattr(so_doc, 'order_id') and not so_doc.resp_code:
+        if review_state == 'opened' and info['review_state'] == 'cleared_and_validated' and hasattr(so_doc, 'order_id') and not so_doc.resp_code:
             row['is_requeryable'] = True
             row['callback_url'] = "%s/payments/%s/interswitch_cb" % (student.absolute_url(),