Changeset 37e743 in indico


Ignore:
Timestamp:
02/25/10 18:28:26 (3 years ago)
Author:
Jose Benito <jose.benito.gonzalez@…>
Branches:
master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72
Children:
d165f1
Parents:
87e262c
git-author:
Jose Benito <jose.benito.gonzalez@…> (02/25/10 18:26:37)
git-committer:
Jose Benito <jose.benito.gonzalez@…> (02/25/10 18:28:26)
Message:

[FIX] show all sessions in add new

before, if 2 sessions had the same name, just 1 was displayed.

Location:
indico/htdocs/js/indico
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • indico/htdocs/js/indico/Core/Widgets/Menu.js

    r1c2910 r37e743  
    205205        var value = pair.get(); 
    206206        var color = null; 
     207        var title = null; 
     208 
     209        if(exists(value.title)){ 
     210            title = value.title; 
     211        }else { 
     212            title = pair.key; 
     213        } 
    207214 
    208215        if(exists(value.color)){ 
     
    216223        } 
    217224 
    218         var link = Html.a({className:'fakeLink', style:{display: 'inline', padding: 0, paddingLeft: '4px', paddingRight: '4px'}}, Util.truncate(pair.key)); 
     225        var link = Html.a({className:'fakeLink', style:{display: 'inline', padding: 0, paddingLeft: '4px', paddingRight: '4px'}}, Util.truncate(title)); 
    219226        var divInput = Html.div({style:{height:'20px', overflow:'auto'}}, colorSquare, link); 
    220227 
  • indico/htdocs/js/indico/Timetable/Management.js

    rceb3c5 r37e743  
    245245                var sessions = {}; 
    246246                each(this.eventInfo.sessions, function(session, key) { 
    247                     sessions[session.title] = {}; 
    248                     sessions[session.title].func = function() { self.addSessionSlot(session); }; 
    249                     sessions[session.title].color = self._retrieveSessionColor(session); 
     247                    sessions[session.id] = {}; 
     248                    sessions[session.id].func = function() { self.addSessionSlot(session); }; 
     249                    sessions[session.id].color = self._retrieveSessionColor(session); 
     250                    sessions[session.id].title = session.title; 
    250251                }); 
    251252 
Note: See TracChangeset for help on using the changeset viewer.