Changeset 160

Timestamp:

6 Nov 2005, 15:07:41 (19 years ago)

Author:

joachim

Message:

=fixed virtual hosting

Location:

waeup_product/trunk

Files:

• Extensions/install.py (modified) (3 diffs)
• skins/waeup_default/temporary_view_all.pt (modified) (1 diff)

waeup_product/trunk/Extensions/install.py

@@ -185 +185 @@
                         'id'        : 'student_administration',
                         'name'      : 'Students',
-                        'action'    : 'string:${portal_url}/students',
+                        'action'    : "python: portal.portal_url.getUrlFromRpath('sections/demouni/students')",
                         #'action'    : 'string:$portal_url%(path)s/students' % vars(),
                         'permission': (View, ),
@@ -194 +194 @@
                         'id'        : 'Academics',
                         'name'      : 'Academics',
-                        #'action'    : 'string:$portal_url%(path)s/academics' % vars(),
-                        #'action'    : 'string:${portal_url}/sections/unidemo',
-                        'action'    : 'string:${portal_url}/academics',
+                        'action'    : "python: portal.portal_url.getUrlFromRpath('sections/demouni/academics')",
+                        #'action'    : 'string:${portal_url}/academics',
                         'permission': (View ),
                         'category'  : 'main_tabs',
@@ -204 +203 @@
                         'id'        : 'accomodation',
                         'name'      : 'Accommodation',
-                        #'action'    : 'string:$portal_url%(path)s/accommodation' % vars(),
-                        #'action'    : 'string:${portal_url}/sections/waeup/accommodation/accommodation_index_html',
-                        'action'    : 'string:${portal_url}/accommodation',
+                        'action'    : "python: portal.portal_url.getUrlFromRpath('sections/demouni/accommodation')",
+                        #'action'    : 'string:${portal_url}/accommodation',
                         'permissions': (View),
                         #'permissions': (ModifyPortalContent,UniversityManage,StudentManage),

waeup_product/trunk/skins/waeup_default/temporary_view_all.pt

@@ -44 +44 @@
      <td>
       <i>
-      <a href="xxx" tal:condition="python: getattr(item,'id',None)" 
+      <a href="xxx" tal:condition="python: checkPerm('View',item)" 
                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"/>
+               tal:content="item/title_or_id"></a>
+     <span tal:condition="python: not checkPerm('View',item)" tal:content="item/title_or_id"/>
+     </i>
      </td>
      </tr>