Changeset 1558 for WAeUP_SRP/branches/joachim-event-branch/profiles/default

Timestamp:

15 Mar 2007, 16:44:41 (18 years ago)

Author:

joachim

Message:

merged trunk up to 1557

Location:

WAeUP_SRP/branches/joachim-event-branch/profiles/default

Files:

• accommodation.xml (modified) (1 diff)
• payments_catalog.xml (modified) (1 diff)
• pumeresults.xml (modified) (1 diff)
• results_import.xml (modified) (1 diff)
• returning_import.xml (modified) (1 diff)
• schemas/import_student_course_results.xml (modified) (1 diff)
• types/StudyLevel.xml (modified) (1 diff)
• vocabularies/searchable_student_states.xml (modified) (1 diff)
• vocabularies/student_import_mode.xml (copied) (copied from WAeUP_SRP/trunk/profiles/default/vocabularies/student_import_mode.xml)

WAeUP_SRP/branches/joachim-event-branch/profiles/default/accommodation.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="catalog.xsl"?>
-<object name="portal_catalog" meta_type="WAeUP Table">
+<object name="portal_accommodation" meta_type="WAeUP Table">
  <column value="bed"/>
  <column value="bed_type"/>

WAeUP_SRP/branches/joachim-event-branch/profiles/default/payments_catalog.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="catalog.xsl"?>
-<object name="payments_catalog" meta_type="CMF Catalog">
+<object name="payments_catalog" meta_type="WAeUP Table">
  <column value="id"/>
  <column value="student_id"/>

WAeUP_SRP/branches/joachim-event-branch/profiles/default/pumeresults.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="catalog.xsl"?>
-<object name="portal_catalog" meta_type="WAeUP Table">
+<object name="portal_pumeresults" meta_type="WAeUP Table">
  <column value="jamb_reg_no"/>
  <column value="name"/>

WAeUP_SRP/branches/joachim-event-branch/profiles/default/results_import.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="catalog.xsl"?>
-<object name="portal_catalog" meta_type="CMF Catalog">
+<object name="results_import" meta_type="WAeUP Table">
  <column value="key"/>
  <column value="matric_no"/>

WAeUP_SRP/branches/joachim-event-branch/profiles/default/returning_import.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="catalog.xsl"?>
-<object name="portal_catalog" meta_type="CMF Catalog">
+<object name="returning_import" meta_type="WAeUP Table">
  <column value="matric_no"/>
  <column value="Entryregno"/>

WAeUP_SRP/branches/joachim-event-branch/profiles/default/schemas/import_student_course_results.xml

@@ -6 +6 @@
  <field name="score" meta_type="CPS String Field"/>
 </object>
-

WAeUP_SRP/branches/joachim-event-branch/profiles/default/types/StudyLevel.xml

@@ -37 +37 @@
   <permission value="View"/>
  </action>
-   <action title="Add Course" action_id="new_entry" category="object"
-    condition_expr=""
-    url_expr="string:${object_url}/content_create?type_name=CertificateCourse"
-    visible="True">
-  <permission value="Modify portal content"/>
+  <action title="Add Course" action_id="new_entry" category="object"
+          condition_expr=""
+          url_expr="string:${object_url}/content_create?type_name=CertificateCourse"
+          visible="True">
+    <permission value="Modify portal content"/>
+  </action>
+  <action title="Delegate" action_id="localroles" category="object"
+          condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
+          visible="True">
+    <permission value="Modify portal content"/>
  </action>
+
 </object>

WAeUP_SRP/branches/joachim-event-branch/profiles/default/vocabularies/searchable_student_states.xml

@@ -19 +19 @@
  <item key="clearance_requested" msgid="">clearance requested</item>
  <item key="cleared_and_validated" msgid="">cleared and validated</item>
+ <item key="courses_registered" msgid="">courses registered</item>
+ <item key="courses_validated" msgid="">courses validated</item>
  <item key="content_addable" msgid="">content addable</item>
 </object>