Changeset 311

Timestamp:

15 Jul 2006, 14:41:46 (18 years ago)

Author:

joachim

Message:

=more changes

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/roots/campus/academics.xml (modified) (1 diff)
• profiles/default/types/Certificate.xml (modified) (3 diffs)
• profiles/default/types/CertificateCourse.xml (modified) (1 diff)
• profiles/default/types/CertificatesFolder.xml (modified) (1 diff)
• profiles/default/types/Course.xml (modified) (2 diffs)
• profiles/default/types/CoursesFolder.xml (modified) (2 diffs)
• profiles/default/types/Faculty.xml (modified) (1 diff)
• profiles/default/vocabularies/courselevel.xml (modified) (1 diff)
• profiles/default/workflows.xml (modified) (2 diffs)
• skins/waeup_custom/content_status_modify.py (added)
• skins/waeup_custom/cpsdocument_create.py (modified) (1 diff)

WAeUP_SRP/trunk/profiles/default/roots/campus/academics.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 <object name="academics">
-  <property name="title">Academics</property>
+  <property name="Title">Academics</property>
 </object>

WAeUP_SRP/trunk/profiles/default/types/Certificate.xml

@@ -24 +24 @@
  </property>
  <property name="layouts">
+  <element value="common"/>
   <element value="certificate"/>
  </property>
@@ -32 +33 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="certificate_view"/>
- <alias from="view" to="certificate_view"/>
+ <alias from="(Default)" to="academics_contents"/>
+ <alias from="view" to="academics_contents"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/certificate_view" visible="True">
+    url_expr="string:${object_url}/academics_contents" visible="True">
   <permission value="View"/>
  </action>
  <action title="action_edit" action_id="edit" category="object"
-    condition_expr="python:member and 'Manager' in member.getRoles()"
-    url_expr="string:${object_url}/cpsdocument_edit_form" visible="True">
+    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
+    visible="True">
   <permission value="Modify portal content"/>
  </action>
  <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="python:member and 'Manager' in member.getRoles()"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="False">
+    condition_expr="" url_expr="string:${object_url}/cpsdocument_metadata"
+    visible="False">
   <permission value="Modify portal content"/>
  </action>
@@ -53 +54 @@
   <permission value="Modify portal content"/>
  </action>
- <action title="action_folder_contents" action_id="contents" category="object"
-    condition_expr="" url_expr="string:${object/absolute_url}/folder_contents"
-    visible="True"/>
 </object>

WAeUP_SRP/trunk/profiles/default/types/CertificateCourse.xml

@@ -31 +31 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="temporary_view_all"/>
- <alias from="view" to="temporary_view_all"/>
+ <alias from="(Default)" to="cpsdocument_view"/>
+ <alias from="view" to="cpsdocument_view"/>
  <action title="Standard View" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/temporary_view_all"
+    condition_expr="" url_expr="string:${object_url}/cpsdocument_view"
     visible="True">
   <permission value="View"/>
  </action>
  <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/waeup_edit_form"
+    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
     visible="True"/>
  <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="python:member and 'Manager' in member.getRoles()"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="False"/>
+    condition_expr="" url_expr="string:${object_url}/cpsdocument_metadata"
+    visible="False"/>
  <action title="delegate" action_id="localroles" category="object"
     condition_expr="" url_expr="string:${object_url}/folder_localrole_form"

WAeUP_SRP/trunk/profiles/default/types/CertificatesFolder.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
-<object name="CertificatesFolder" meta_type="CPS Flexible Type Information"
+<object name="Certificate" meta_type="CPS Flexible Type Information"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
+ <property name="title">WAeUP Certificate</property>
  <property name="description"></property>
  <property name="content_icon"></property>
- <property name="content_meta_type">CPS Document</property>
- <property name="product">CPSDocument</property>
- <property name="factory">addCPSDocument</property>
- <property name="immediate_view"></property>
+ <property name="content_meta_type">Certificate</property>
+ <property name="product">WAeUP_SRP</property>
+ <property name="factory">addCertificate</property>
+ <property name="immediate_view">folder_view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types">
-  <element value="Certificate"/>
+  <element value="StudyLevel"/>
  </property>
  <property name="allow_discussion">False</property>
  <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">document</property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="schemas"/>
- <property name="layouts"/>
- <property name="layout_clusters"/>
+ <property name="cps_proxy_type">folder</property>
+ <property name="cps_display_as_document_in_listing">True</property>
+ <property name="schemas">
+  <element value="metadata"/>
+  <element value="common"/>
+  <element value="certificate"/>
+ </property>
+ <property name="layouts">
+  <element value="common"/>
+  <element value="certificate"/>
+ </property>
+ <property name="layout_clusters">
+  <element value="metadata:metadata"/>
+ </property>
  <property name="flexible_layouts"/>
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_contents"/>
- <alias from="view" to="academics_contents"/>
+ <alias from="(Default)" to="certificate_view"/>
+ <alias from="view" to="certificate_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+    url_expr="string:${object_url}/certificate_view" visible="True">
   <permission value="View"/>
  </action>
- <action title="Add Certificate" action_id="add_certificate" category="object"
-    condition_expr="python:True or member and 'UniversityManager'in member.getRoles()"
-    url_expr="string:${object/absolute_url}/create_certificate"
-    visible="True"/>
+ <action title="action_edit" action_id="edit" category="object"
+    condition_expr="python:member and 'Manager' in member.getRoles()"
+    url_expr="string:${object_url}/cpsdocument_edit_form" visible="True">
+  <permission value="Modify portal content"/>
+ </action>
+ <action title="action_metadata" action_id="metadata" category="object"
+    condition_expr="python:member and 'Manager' in member.getRoles()"
+    url_expr="string:${object_url}/cpsdocument_metadata" visible="False">
+  <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"/>
- <action title="Add Certificate" action_id="new_entry" category="object"
-    condition_expr=""
-    url_expr="string:${object/absolute_url}/content_create?type_name=Certificate"
-    visible="True"/>
+    visible="True">
+  <permission value="Modify portal content"/>
+ </action>
 </object>

WAeUP_SRP/trunk/profiles/default/types/Course.xml

@@ -22 +22 @@
  </property>
  <property name="layouts">
+  <element value="common"/>
   <element value="course"/>
  </property>
@@ -30 +31 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="temporary_view_all"/>
- <alias from="view" to="temporary_view_all"/>
+ <alias from="(Default)" to="cpsdocument_view"/>
+ <alias from="view" to="cpsdocument_view"/>
  <action title="Standard View" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/temporary_view_all"
+    condition_expr="" url_expr="string:${object_url}/cpsdocument_view"
     visible="True">
   <permission value="View"/>
  </action>
  <action title="action_edit" action_id="edit" category="object"
-    condition_expr="python:member and 'Manager' in member.getRoles()"
-    url_expr="string:${object_url}/cpsdocument_edit_form" visible="True">
+    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
+    visible="True">
   <permission value="Modify portal content"/>
-  <permission value="University Manage"/>
- </action>
- <action title="action_folder_contents" action_id="contents" category="object"
-    condition_expr="python:member and 'Manager' in member.getRoles()"
-    url_expr="string:${object_url}/folder_contents" visible="True">
-  <permission value="Modify portal content"/>
-  <permission value="University Manage"/>
  </action>
  <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="python:member and 'Manager' in member.getRoles()"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
+    condition_expr="" url_expr="string:${object_url}/cpsdocument_metadata"
+    visible="True">
   <permission value="Modify portal content"/>
  </action>

WAeUP_SRP/trunk/profiles/default/types/CoursesFolder.xml

@@ -16 +16 @@
  <property name="allow_discussion">False</property>
  <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">document</property>
+ <property name="cps_proxy_type">folder</property>
  <property name="cps_display_as_document_in_listing">False</property>
  <property name="schemas"/>
@@ -30 +30 @@
   <permission value="View archived revisions"/>
  </action>
- <action title="Add Course" action_id="add_course" category="object"
-    condition_expr="python:True or member and 'UniversityManager'in member.getRoles()"
-    url_expr="string:${object/absolute_url}/create_course" visible="True"/>
- <action title="action_folder_contents" action_id="contents" category="object"
-    condition_expr="" url_expr="string:${object/absolute_url}/folder_contents"
-    visible="False"/>
  <action title="delegate" action_id="localroles" category="object"
     condition_expr="" url_expr="string:${object_url}/folder_localrole_form"

WAeUP_SRP/trunk/profiles/default/types/Faculty.xml

@@ -42 +42 @@
  <action title="action_edit" action_id="edit" category="object"
     condition_expr="python:member and 'Manager' in member.getRoles()"
-    url_expr="string:${object_url}/faculty_edit_form" visible="True">
+    url_expr="string:${object_url}/academics_edit_form" visible="True">
   <permission value="Modify portal content"/>
  </action>

WAeUP_SRP/trunk/profiles/default/vocabularies/courselevel.xml

@@ -9 +9 @@
  <item key="300" msgid="">Year 3 (300 Level)</item>
  <item key="400" msgid="">Year 4 (400 Level)</item>
+ <item key="500" msgid="">Year 5 (400 Level)</item>
 </object>

WAeUP_SRP/trunk/profiles/default/workflows.xml

@@ -27 +27 @@
    <bound-workflow workflow_id="workspace_calendar_wf"/>
   </type>
-  <type type_id="CertificateFolder">
+  <type type_id="CertificatesFolder">
    <bound-workflow workflow_id="waeup_base_wf"/>
   </type>
@@ -36 +36 @@
    <bound-workflow workflow_id="waeup_base_wf"/>
   </type>
-  <type type_id="CourseFolder">
+  <type type_id="CoursesFolder">
    <bound-workflow workflow_id="waeup_base_wf"/>
   </type>

WAeUP_SRP/trunk/skins/waeup_custom/cpsdocument_create.py

@@ -36 +36 @@
     url = ob.absolute_url()
     meth_id = ti.queryMethodID('created', None)
-    if meth_id is not None:
-        getattr(context, meth_id)(object=ob)
+##    if meth_id is not None:
+##        getattr(context, meth_id)(object=ob)
     action = ob.getTypeInfo().immediate_view
     psm = 'psm_content_created'