Changeset 1669 for WAeUP_SRP/branches/joachim-event-branch/skins/waeup_academics

Timestamp:

4 Apr 2007, 06:31:52 (18 years ago)

Author:

joachim

Message:

merged up to 1664

Location:

WAeUP_SRP/branches/joachim-event-branch/skins/waeup_academics

Files:

• getCertificateInfo.py (modified) (3 diffs)
• getLevelInfo.py (modified) (3 diffs)
• level_view.pt (modified) (1 diff)

WAeUP_SRP/branches/joachim-event-branch/skins/waeup_academics/getCertificateInfo.py

@@ -12 +12 @@
 return Info about a Certificate
 """
+def cmp_id(a,b):
+    s1 = "%(id)s" % a
+    s2 = "%(id)s" % b
+    if s1 == s2:
+        return 0
+    if s1 > s2:
+        return 1
+    return -1
+
 request = context.REQUEST
 
@@ -18 +27 @@
 
 info = {}
-info['action'] = "%s" % context.campus.absolute_url()
+info['action'] = "%s" % context.absolute_url()
 info['choosen_ids'] = request.get('ids',[])
 info['doc'] = context.getContent()
@@ -33 +42 @@
     row['url'] = l.absolute_url()
     items.append(row)
+items.sort(cmp_id)
 info['items'] = items
 return info

WAeUP_SRP/branches/joachim-event-branch/skins/waeup_academics/getLevelInfo.py

@@ -16 +16 @@
 wf = context.portal_workflow
 mtool = context.portal_membership
+academics_path = "%s/campus/academics" % context.portal_url()
 path_info = request.get('PATH_INFO').split('/')
 try:
@@ -44 +45 @@
     ro = r.getObject()
     rd = ro.getContent()
-    row['id'] = r.getId
+    course_id = row['id'] = r.getId
     row['title'] = rd.Title()
     row['core'] = rd.core_or_elective
@@ -50 +51 @@
     row['url'] = ro.absolute_url()
     row['review_state'] = wf.getInfoFor(ro,'review_state','None')
-    row['is_editable'] = mtool.checkPermission('Modify portal content', ro)
+    editable = row['is_editable'] = mtool.checkPermission('Modify portal content', ro)
+    if editable:
+        course_res = context.courses_catalog(code=course_id)
+        if course_res:
+            rc = course_res[0]
+            row['real_course_path'] = "%s/%s/%s/courses/%s" % (academics_path,rc.faculty,rc.department,course_id)
     if rd.semester == 'first':
         first.append(row)

WAeUP_SRP/branches/joachim-event-branch/skins/waeup_academics/level_view.pt

@@ -48 +48 @@
                     [edit]
                     </a> 
+                <a tal:condition="row/real_course_path|nothing" 
+                   href="edit" tal:attributes="href string:${row/real_course_path}">
+                    [goto course]
+                    </a> 
                 </td>
               </tr>