Changeset 155 for waeup_product/trunk

Timestamp:

4 Nov 2005, 22:20:14 (19 years ago)

Author:

joachim

Message:

=PERSONAL invisible

Location:

waeup_product/trunk/skins

Files:

• waeup_default/getWAeUPTypes.py (modified) (2 diffs)
• waeup_default/portlet_session_info.pt (modified) (1 diff)
• waeup_default/temporary_view_all.pt (modified) (1 diff)
• waeup_student/add_course_ticket.py (added)
• waeup_student/check_admission.py (modified) (1 diff)

waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py

@@ -221 +221 @@
           'action': 'temporary_view_all',
           'condition': '',
-          'permission': (StudentManage,UniversityManage),
+          'permission': (View,StudentManage,UniversityManage),
           'category': 'object',
           'visible': True,},
@@ -244 +244 @@
           'name'      : 'Personal Data',
           'action'    : 'string:${object/absolute_url}/PERSONAL',
-          'condition':  '',
+          'condition':  "python:getattr(object,'PERSONAL',None)",
           'permission': (ModifyPortalContent,)},
           {

waeup_product/trunk/skins/waeup_default/portlet_session_info.pt

@@ -9 +9 @@
       <span tal:condition="python: 0" tal:content="python:mtool.getCPSCandidateLocalRoles(context)" />
     </div>
-    
-    
     <br />
-    
     <a href="" tal:condition="python: 'Student' in member.getRoles() and not 'UniversityManager' in member.getRoles()" 
                tal:attributes="href string:${context/portal_url}/students/${member}">
            Go to your personal area
     </a>
-    
-  
+    <br />
     <a href="" tal:condition="python: 0" 
                tal:attributes="href string:${context/portal_url}/cpsdirectory_entry_view?dirname=members&id=${member}">        
           Edit your Preferences
     </a>
-    
-    
-    
+    <br />
     <a href="" i18n:translate=""
                tal:attributes="href string:logout">

waeup_product/trunk/skins/waeup_default/temporary_view_all.pt

@@ -44 +44 @@
      <td>
       <i>
-      <a href="jamb" 
+      <a href="xxx" tal:condition="python: getattr(item,'id',None)" 
                tal:attributes="href item/absolute_url"
                tal:content="item/title_or_id"></a></i>
+              <span tal:condition="python: not getattr(item,'id',None)" tal:content="item/title_or_id"/>
      </td>
      </tr>

waeup_product/trunk/skins/waeup_student/check_admission.py

@@ -45 +45 @@
     sf = getattr(context,s_id,None)
     if sf and getattr(sf,'PERSONAL',None):
-        psm = "Your already admitted, pleae login"
+        psm = "Your already admitted, please login"
         return context.check_admission_form(rendered = res,
                                  psm = psm,