Changeset 18bdc4 in indico


Ignore:
Timestamp:
06/10/10 18:11:37 (3 years ago)
Author:
Jeremy Herr <jeremy.herr@…>
Branches:
master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 36509dd327b5670bb394f5ec070c14653b4c9c19
Children:
0cb016
Parents:
d21fd3
git-author:
Jeremy Herr <jeremy.herr@…> (05/03/10 12:34:41)
git-committer:
Jeremy Herr <jeremy.herr@…> (06/10/10 18:11:37)
Message:

[MIN] fixed CDSQueryURL escape chars

  • fixed issue where CDSQueryURL escaped % chars, by using string.replace instead of "%s" % string.
  • added a killProgressReload popup window to keep user from clicking while page is reloading
  • temporarily removed images from remote webpage ... when they are not accessible the page loads forever.
Location:
indico/MaKaC/plugins/Collaboration/RecordingManager
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • indico/MaKaC/plugins/Collaboration/RecordingManager/common.py

    rd21fd3 r18bdc4  
    706706    # if this CDS query needs to be changed (thanks jerome.caffaro@cern.ch): 
    707707    # http://invenio-demo.cern.ch/help/hacking/search-engine-api 
    708     url = CollaborationTools.getOptionValue("RecordingManager", "CDSQueryURL") % id_plus_wildcard 
     708    # NB: We replace the string INDICO_ID manually instead of using %s because 
     709    # there are also url-encoded chars containing the % char. 
     710    optionsCDSQueryURL = CollaborationTools.getOptionValue("RecordingManager", "CDSQueryURL") 
     711    escapedOptionsCDSQueryURL = optionsCDSQueryURL.replace("REPLACE_WITH_INDICO_ID", id_plus_wildcard) 
     712    Logger.get('RecMan').debug("optionsCDSQueryURL = " + optionsCDSQueryURL) 
     713    Logger.get('RecMan').debug("escapedOptionsCDSQueryURL = " + escapedOptionsCDSQueryURL) 
     714    url = escapedOptionsCDSQueryURL 
    709715 
    710716    # This dictionary will contain CDS ID's, referenced by Indico ID's 

  • indico/MaKaC/plugins/Collaboration/RecordingManager/options.py

    r4dc293 r18bdc4  
    113113               "visible": True} ), 
    114114 
    115     ("CDSQueryURL", {"description" : _("CDS query URL"), 
     115    ("CDSQueryURL", {"description" : _("CDS query URL (put the string REPLACE_WITH_INDICO_ID where you want the Indico ID to be)"), 
    116116               "type": str, 
    117                "defaultValue": '''http://cdsdev.cern.ch/search?p=sysno%%3A%%22INDICO.%s%%22&f=&action_search=Search&sf=&so=d&rm=&rg=1000&sc=1&ot=970&of=t&ap=0''', 
     117               "defaultValue": '''http://cdsdev.cern.ch/search?p=sysno%3A%22INDICO.REPLACE_WITH_INDICO_ID%22&f=&action_search=Search&sf=&so=d&rm=&rg=1000&sc=1&ot=970&of=t&ap=0''', 
    118118               "editable": True, 
    119119               "visible": True} ), 

  • indico/MaKaC/plugins/Collaboration/RecordingManager/tpls/Extra.js

    rd21fd3 r18bdc4  
    471471                        killProgress(); // turn off the progress indicator 
    472472 
     473                        // Tell user to wait while page reloads 
     474                        var killProgressReload = IndicoUI.Dialogs.Util.progress($T("CDS record submitted. Page now reloading to update status...")); 
     475 
    473476                        // Reload page so you can see updated status of talks 
    474477                        window.location.reload(); 
    … …  
    509512                killProgress(); // turn off the progress indicator 
    510513 
     514                // Tell user to wait until page reloads 
     515                var killProgressReload = IndicoUI.Dialogs.Util.progress($T("Indico link to CDS record created. Page now reloading to update status...")); 
     516 
    511517                // Reload page so you can see updated status of talks 
    512518                window.location.reload(); 
    513  
    514519 
    515520            } else { 

  • indico/MaKaC/plugins/Collaboration/RecordingManager/tpls/NewBookingForm.tpl

    rd9384a r18bdc4  
    114114                                box:  <%= orphan["box"]  %> 
    115115                            </td> 
    116                             <td width="70%" align="right"> 
     116                            <td width="70%" align="right">&nbsp; 
     117<!-- 
    117118                                <img src="<%= PreviewURL %><%= LOID %>/video0001.jpg"> 
    118119                                <img src="<%= PreviewURL %><%= LOID %>/video0002.jpg"><br /> 
     120 --> 
    119121                            </td> 
    120122                        </tr> 
    121123                        <tr width="100%"> 
    122                             <td width="100%" colspan="2"> 
     124                            <td width="100%" colspan="2">&nbsp; 
     125<!-- 
    123126                            <img src="<%= PreviewURL %><%= LOID %>/content0001.jpg"> 
    124127                            <img src="<%= PreviewURL %><%= LOID %>/content0002.jpg"> 
    125128                            <img src="<%= PreviewURL %><%= LOID %>/content0003.jpg"> 
    126129                            <img src="<%= PreviewURL %><%= LOID %>/content0004.jpg"> 
    127                             </td> 
     130 --> 
     131                             </td> 
    128132                        </tr> 
    129133                    </table> 
Note: See TracChangeset for help on using the changeset viewer.