← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/tos/media/tos.js

  • Committer: David Coles
  • Date: 2010-08-30 03:26:13 UTC
  • Revision ID: coles.david@gmail.com-20100830032613-d14vng0jkelniu3l
python-console: Fix globals broken with new JSON library.

simplejson always returns unicode strings. cJSON would return ordinary strings 
if possible. cPickle.loads() only accepts strings. At present we use pickle 
version 0 so they should all works as ASCII strings. Higher versions of pickle 
are not plain ASCII and are likely to break this and so this should be fixed 
at some point.

Also replaced unconditional exception with one that catches Pickle errors. Not 
sure the best way to report failures of these functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/tos/media/tos.js
99
99
    tos_acceptbuttons.appendChild(dom_make_text_elem("p",
100
100
        "Error connecting to server. Please try again later. "));
101
101
    }
 
102
    else if (response.response == 'error')
 
103
    {
 
104
    tos_acceptbuttons.appendChild(dom_make_text_elem("p",
 
105
        "Error activating user: " + response.message));
 
106
    }
102
107
    else
103
108
    {
104
109
        /* Refresh the page; as the user is now (apparently) logged in */
105
 
        window.location.href = window.location.href;
 
110
        window.location.href = parse_url(window.location.href).args["url"] || "/";
106
111
    }
107
112
}
108
113
 
109
114
function decline_license()
110
115
{
111
116
    /* Redirect to the logout page */
112
 
    window.location.href = app_path("logout");
 
117
    window.location.href = app_path("+logout");
113
118
}