Changeset 598

Timestamp:

29 Sep 2006, 16:16:02 (18 years ago)

Author:

joachim

Message:

added is_editable for showing the edit link and the review_state

Location:

WAeUP_SRP/trunk

Files:

• Academics.py (modified) (1 diff)
• skins/waeup_academics/academics_index.py (modified) (1 diff)
• skins/waeup_academics/courses_index_view.pt (modified) (1 diff)
• skins/waeup_academics/faculty_index_view.pt (modified) (1 diff)
• skins/waeup_academics/getCoursesInfo.py (modified) (1 diff)
• skins/waeup_academics/getDepartmentsInfo.py (modified) (2 diffs)
• skins/waeup_academics/getLevelInfo.py (modified) (1 diff)
• skins/waeup_academics/level_index_view.pt (modified) (1 diff)

WAeUP_SRP/trunk/Academics.py

@@ -802 +802 @@
         for obj in objects:
             lr = pm.getMergedLocalRoles(obj)
+            #lr = pm.getCPSCandidateLocalRoles(obj)
             logger.info('exporting %s %s ' % (obj.id, lr))
             export.append('"%s","%s"' % (obj.getId(),lr))

WAeUP_SRP/trunk/skins/waeup_academics/academics_index.py

@@ -22 +22 @@
 campus = context.portal_catalog(meta_type = "University")[-1].getObject()
 member = pm.getAuthenticatedMember()
-roles = member.getRoles()
+roles = member.getRolesInContext(context)
 isManager = "Manager" in roles or "SectionManager" in roles
 isStudent = "Student" in roles
+isStaff = "Staff" in roles
 
-if isManager:
+if isStaff or isManager:
     if context.portal_type == 'AcademicsFolder':
         return context.academics.academics_index_view()

WAeUP_SRP/trunk/skins/waeup_academics/courses_index_view.pt

@@ -65 +65 @@
                     <strong tal:content="row/title" /></a> </td>
                 <td tal:content="row/id"> </td>
-                <td tal:content="row/review_state"> </td>
-                <td><a href="edit" tal:attributes="href string:${row/url}/cpsdocument_edit_form">[edit]</a></td>
+                <td tal:condition="row/is_editable" tal:content="row/review_state"> </td>
+                <td tal:condition="row/is_editable"><a href="edit" tal:attributes="href string:${row/url}/cpsdocument_edit_form">[edit]</a></td>
               </tr>
             </span>

WAeUP_SRP/trunk/skins/waeup_academics/faculty_index_view.pt

@@ -39 +39 @@
 
             <td> 
+<<<<<<< .mine
+            <a tal:condition="row/is_editable"
+=======
             <a tal:condition="row/is_edit_allowed"
+>>>>>>> .r597
                 href="edit" tal:attributes="href string:${row/url}/external_edit_form"
                 target="edit"

WAeUP_SRP/trunk/skins/waeup_academics/getCoursesInfo.py

@@ -48 +48 @@
     row['url'] = ro.absolute_url()
     row['review_state'] = wf.getInfoFor(ro,'review_state','None')
+    row['is_editable'] = mtool.checkPermission('Modify portal content', ro)
     items.append(row)
 info['courses'] = items

WAeUP_SRP/trunk/skins/waeup_academics/getDepartmentsInfo.py

@@ -21 +21 @@
 info = {}
 member_id = str(member)
-roles = member.getRoles()
+roles = member.getRolesInContext(context)
 info['is_manager'] = 'Manager' in roles or 'SectionManager' in roles
 info['is_student'] = 'Student' in roles
@@ -39 +39 @@
     row['title'] = rd.LongTitle()
     row['url'] = ro.absolute_url()
-    row['is_edit_allowed'] = mtool.checkPermission('Modify portal content', ro)
+    row['is_editable'] = mtool.checkPermission('Modify portal content', ro)
     items.append(row)
 info['items'] = items

WAeUP_SRP/trunk/skins/waeup_academics/getLevelInfo.py

@@ -55 +55 @@
     row['url'] = ro.absolute_url()
     row['review_state'] = wf.getInfoFor(ro,'review_state','None')
+    row['is_editable'] = mtool.checkPermission('Modify portal content', ro)
     if rd.semester == 'first':
         first.append(row)

WAeUP_SRP/trunk/skins/waeup_academics/level_index_view.pt

@@ -40 +40 @@
                 <td tal:content="row/id"></td>
                 <td tal:content="python: test(row['core'],'core','elective')"></td>
-                <td tal:content="row/review_state"> </td>
-                <td><a href="edit" tal:attributes="href string:${row/url}/cpsdocument_edit_form">[edit]</a></td>
+                <td tal:condition="row/is_editable" tal:content="row/review_state"> </td>
+                <td tal:condition="row/is_editable" ><a href="edit" tal:attributes="href string:${row/url}/cpsdocument_edit_form">[edit]</a></td>
               </tr>
             </span>