Changeset 309 for WAeUP_SRP/trunk

Timestamp:

15 Jul 2006, 07:40:53 (18 years ago)

Author:

joachim

Message:

=types changed

Location:

WAeUP_SRP/trunk

Files:

• Academics.py (modified) (2 diffs)
• profiles/default/types/CertificatesFolder.xml (modified) (1 diff)
• profiles/default/types/CoursesFolder.xml (modified) (1 diff)
• profiles/default/workflows.xml (modified) (1 diff)
• skins/waeup_academics/academics_content_lib_info_detail_tab.pt (modified) (1 diff)
• skins/waeup_academics/academics_contents.pt (modified) (1 diff)
• skins/waeup_academics/academics_edit.py (added)
• skins/waeup_academics/academics_edit_ajax.py (added)
• skins/waeup_academics/academics_edit_buttons.pt (added)
• skins/waeup_academics/academics_edit_form.pt (added)
• skins/waeup_academics/faculty_edit.py (deleted)
• skins/waeup_academics/faculty_edit_form.pt (deleted)
• skins/waeup_default/getCreatableItems.py (modified) (1 diff)

WAeUP_SRP/trunk/Academics.py

@@ -353 +353 @@
                 no_import.write('"%(CosCode)s","%(CertCode)s","%(Session)s","%(Level)s","%(Core)s","%(Elective)s","%(Mandatory)s","%(AdmStatus)s","%(Dept)s","%(Semester)s"\n' % cert_course)
                 continue
-            certificate = certificate[-1].getObject()
+            certificate = certs[code]
             certificate_code = certificate.getId()
             if course_code not in c_ids:
@@ -567 +567 @@
     object = Department(id, **kw)
     id = object.getId()
-    container._setObject(id, object)
-    dep = getattr(container,id).getContent()
-    dep.invokeFactory('CoursesFolder','Courses')
-    o = getattr(dep,'Courses')
-    dict = {'Title': 'Courses'}
-    o.getContent().edit(mapping=dict)
-    dep.invokeFactory('CertificatesFolder','Certificates')
-    o = getattr(dep,'Certificates')
-    dict = {'Title': 'Certificates'}
-    o.getContent().edit(mapping=dict)
+    container._setObject(id, object)    
+##    dep = getattr(container,id).getEditableContent()   #getContent()
+##    dep.invokeFactory('CoursesFolder','Courses')
+##    o = getattr(dep,'Courses')
+##    dict = {'Title': 'Courses'}
+##    o.getContent().edit(mapping=dict)
+##    dep.invokeFactory('CertificatesFolder','Certificates')
+##    o = getattr(dep,'Certificates')
+##    dict = {'Title': 'Certificates'}
+##    o.geetContent().edit(mapping=dict)
     if REQUEST is not None:
         url = container.absolute_url()
         REQUEST.RESPONSE.redirect('%s/manage_main' % url)
+
 ###)
 

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

@@ -24 +24 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="(Default)"/>
- <alias from="view" to="(Default)"/>
+ <alias from="(Default)" to="academics_view"/>
+ <alias from="view" to="academics_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     url_expr="string:${object_url}/academics_contents" 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_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"
+    visible="True"/>
  <action title="Add Certificate" action_id="new_entry" category="object"
     condition_expr=""

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

@@ -24 +24 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="(Default)"/>
- <alias from="view" to="(Default)"/>
+ <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}/academics_contents" visible="True">
   <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"
+    visible="False"/>
  <action title="Add Course" action_id="new_entry" category="object"
     condition_expr=""

WAeUP_SRP/trunk/profiles/default/workflows.xml

@@ -27 +27 @@
    <bound-workflow workflow_id="workspace_calendar_wf"/>
   </type>
+  <type type_id="CertificateFolder">
+   <bound-workflow workflow_id="waeup_base_wf"/>
+  </type>
   <type type_id="Certificate">
    <bound-workflow workflow_id="waeup_base_wf"/>
   </type>
   <type type_id="CertificateCourse">
+   <bound-workflow workflow_id="waeup_base_wf"/>
+  </type>
+  <type type_id="CourseFolder">
    <bound-workflow workflow_id="waeup_base_wf"/>
   </type>

WAeUP_SRP/trunk/skins/waeup_academics/academics_content_lib_info_detail_tab.pt

@@ -96 +96 @@
     <strong tal:content="info/long_title|info/title_or_id">ID</strong></a></td>
   <td align="right">
-    <a href="dummy" tal:attributes="href string:${item/absolute_url}/faculty_edit_form">[edit]</a></td>
+    <a href="dummy" tal:attributes="href string:${item/absolute_url}/academics_edit_form">[edit]</a></td>
   <td align="right" tal:condition="size_in_tabs">
     <span tal:condition="info/size|nothing" tal:content="info/size"> </span></td>

WAeUP_SRP/trunk/skins/waeup_academics/academics_contents.pt

@@ -10 +10 @@
 
 <metal:header metal:fill-slot="header">
-  <h1 tal:content="here/title_or_id">
+  <h3 tal:content="here/LongTitle|here/title_or_id">
     Page Title
-  </h1>
+  </h3>
   <div tal:condition="nothing" id="bylineFolder"
     class="ddefault">

WAeUP_SRP/trunk/skins/waeup_default/getCreatableItems.py

@@ -11 +11 @@
 utool = context.portal_url
 base_url = utool.getBaseUrl()
+#return context.getPortalTypeName()
 
-##if context.getPortalTypeName() == 'Portal':
-##    return items
+if context.getPortalTypeName() == 'Portal':
+    return items
 
 content_types = context.getSortedContentTypes(allowed=1)