Ticket #1475: sage-1475_1.patch

a/sage/server/notebook/twist.py

@@ -855 +855 @@
-            notebook.user(self.username)['autosave_interval'] = int(request.args['autosave'][0]) * 60
-            redirect_to_home = True
-        
+        if 'pretty_print' in request.args:
+            notebook.user(self.username)['default_pretty_print'] = bool(request.args['pretty_print'][0])
+            redirect_to_home = True
+        
-        if 'Newpass' in request.args or 'RetypePass' in request.args:
-            if not 'Oldpass' in request.args:
-                error = 'Old password not given'
@@ -870 +874 @@
-            if not error: #webbrowser may auto fill in "old password" even though the user may not want to change her password
-                notebook.change_password(self.username, request.args['Newpass'][0])
-                redirect_to_logout = True
+                
-        if notebook.conf()['email']:
-            if 'Newemail' in request.args:
-                notebook.user(self.username).set_email(request.args['Newemail'][0])
@@ -885 +890 @@
-            return http.RedirectResponse('/home/%s' % self.username)
-        
-        template_dict = {}
+        template_dict['username'] = self.username
-        template_dict['autosave_intervals'] = ((i, ' selected') if notebook.user(self.username)['autosave_interval']/60 == i else (i, '') for i in range(1, 10, 2))
+        template_dict['pretty_print'] = notebook.user(self.username)['default_pretty_print']
-        template_dict['email'] = notebook.conf()['email']
-        if template_dict['email']:
-            template_dict['email_address'] = 'None' if not notebook.user(self.username)._User__email else notebook.user(self.username)._User__email