Changeset 125

Timestamp:

29 Oct 2005, 18:57:08 (19 years ago)

Author:

Henrik Bettermann

Message:

bug fixes

Location:

waeup_product/trunk/skins

Files:

• waeup_default/logged_in.pt (modified) (1 diff)
• waeup_default/portlet_session_info.pt (modified) (1 diff)
• waeup_student/process_waeup_login.py (modified) (2 diffs)

waeup_product/trunk/skins/waeup_default/logged_in.pt

@@ -29 +29 @@
           </p>
           <p>
-            or <a href="" tal:attributes="href string:${base_url}/sections/unidemo/students/check_admission">check your admission status</a>
+            or <a href="" tal:attributes="href string:${base_url}check_admission">check your admission status</a>
           </p>
         </tal:block><!-- isAnon -->

waeup_product/trunk/skins/waeup_default/portlet_session_info.pt

@@ -10 +10 @@
     </div>
     <a href="" tal:condition="python: 'Student' in member.getGroups()" 
-         tal:attributes="href string:${here/portal_url}/students/${member}">
+         tal:attributes="href string:${base_url}/students/${member}">
          Go to your personal area
     </a>
 
-    <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="" 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:${here/portal_url}/logout">Log out</a>
+        tal:attributes="href string:logout">Log out</a>
   </tal:block>
   <tal:block condition="anonymous">
-    <div>You are currently not logged in </div><br />
-    <a href="" tal:attributes="href string:${here/portal_url}/login_form">Log in</a>
+    <div>You are currently not logged in </div>
+    <br />
+    <a href="" tal:attributes="href string:login_form">Log in</a>
   </tal:block>
 </tal:block>
+            

waeup_product/trunk/skins/waeup_student/process_waeup_login.py

@@ -9 +9 @@
 
 if request.form.get('submit') == 'Login':
-    waeup = context.portal_catalog(id = 'waeup')[0]
+    waeup = context.portal_catalog(id = 'demouni')[0]
     if "Manager" in member.getRoles():
         return
     return response.redirect(waeup.getURL())
-        
+
 member_id = str(member)
 ma = getattr(context,member_id)
@@ -22 +22 @@
 pdid = 'PERSONAL'
 ma.invokeFactory('StudentPersonal', pdid)
-pd = getattr(ma,pdid)    
+pd = getattr(ma,pdid)
 pkw = {}
 pkw['sex'] = getattr(jamb,'sex')