Changeset 824614 in indico


Ignore:
Timestamp:
03/18/11 11:03:35 (2 years ago)
Author:
Jose Benito <jose.benito.gonzalez@…>
Branches:
master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72
Children:
0a8409
Parents:
7ca902
Message:

[FIX] Categ access

Location:
indico/MaKaC/webinterface
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • indico/MaKaC/webinterface/common/tools.py

    rebf84a r824614  
    243243                          ' => &#34; 
    244244    """ 
     245    if type(text) != str: 
     246        return "" 
    245247    text = text.replace('&', '&amp;') 
    246248    text = text.replace('<', '&lt;') 

  • indico/MaKaC/webinterface/pages/category.py

    reae6a3 r824614  
    468468            loc = self._conf.getLocation().getName() 
    469469        room = "" 
    470         if self._conf.getRoom() != None: 
     470        if self._conf.getRoom() != None and self._conf.getRoom().getName() != None: 
    471471            room = self._conf.getRoom().getName() 
    472472            url = "javascript:redirectToRoomLoc('" + escape_html(room) + "','" + escape_html(loc) +"')" 
Note: See TracChangeset for help on using the changeset viewer.