Changeset cdec77 in indico

Timestamp:

02/05/10 15:51:05 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

prov-dual-interface

Children:

c220d5

Parents:

3cc806 (diff), 8f6f66 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'v0.97-series' into prov-dual-interface

Location:

indico

Files:

• MaKaC/export/excel.py (modified) (1 diff)
• MaKaC/webinterface/rh/base.py (modified) (2 diffs)
• MaKaC/webinterface/rh/switchInterface.py (added)
• MaKaC/webinterface/tpls/Header.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/InterfaceSwitcher.tpl (added)
• MaKaC/webinterface/urlHandlers.py (modified) (1 diff)
• htdocs/switchInterface.py (added)

indico/MaKaC/export/excel.py

@@ -149 +149 @@
                 if key == "Id":
                     excelGen.addValue(reg.getId())
-                if key == "Email":
+                elif key == "Email":
                     excelGen.addValue(reg.getEmail())
                 elif key == "Institution":

indico/MaKaC/webinterface/rh/base.py

@@ -407 +407 @@
         return p.display()
 
+    ### SWITCHER
+    def _checkInterfaceSwitchNeeded(self):
+
+        from MaKaC.webinterface.session.base import RequestWrapper
+
+        interface = RequestWrapper(self._req).cookies.get("INDICO_INTERFACE")
+        if interface == 'past':
+            current_url = self._req.construct_url(self._req.unparsed_uri)
+            self._redirect(current_url.replace('indicobeta.cern.ch','indico.cern.ch'))
+    ### ***
+
     def process( self, params ):
         """
@@ -442 +453 @@
                         self._setSessionUser()
                         self._setLang()
+
+                        ### SWITCHER
+                        self._checkInterfaceSwitchNeeded();
+                        ### ***
 
                         if self._getUser():

indico/MaKaC/webinterface/tpls/Header.tpl

@@ -1 +1 @@
 <% declareTemplate(newTemplateStyle = True) %>
 
+<% includeTpl('InterfaceSwitcher') %>
 <% includeTpl('Announcement') %>
 

indico/MaKaC/webinterface/urlHandlers.py

@@ -4503 +4503 @@
         return cls.displayUHs.get("%s%s"%(klazz.__name__, type), None)
 
-# Testing helloworld
-class UHHelloWorld(URLHandler):
-    _relativeURL = "helloWorld.py"
-
-    @classmethod
-    def getURL( cls, name=None ):
+class UHSwitchInterface( URLHandler ):
+    _relativeURL = "switchInterface.py"
+
+    def getURL( cls, whereTo, returnURL="" ):
+        """
+        whereTo - 'future' or 'past'
+        """
         url = cls._getURL()
-        if name != None:
-            url.addParam("name", name)
+        if str(returnURL).strip() == "":
+            url.addParam( "returnURL", UHWelcome.getURL())
+        else:
+            url.addParam( "returnURL", returnURL )
+        url.addParam("to", whereTo)
         return url
+