Merge branch 'main' into avm99963-monorail
Merged commit 3779da353b36d43cf778e7d4f468097714dd4540
GitOrigin-RevId: 6451a5c6b75afb0fd1f37b3f14521148d0722ea8
diff --git a/sitewide/usersettings.py b/sitewide/usersettings.py
index 8484afc..163d731 100644
--- a/sitewide/usersettings.py
+++ b/sitewide/usersettings.py
@@ -14,14 +14,14 @@
import ezt
from businesslogic import work_env
+from framework import flaskservlet
from framework import framework_helpers
from framework import permissions
-from framework import servlet
from framework import template_helpers
from framework import urls
-class UserSettings(servlet.Servlet):
+class UserSettings(flaskservlet.FlaskServlet):
"""Shows a page with a simple form to edit user preferences."""
_PAGE_TEMPLATE = 'sitewide/user-settings-page.ezt'
@@ -66,10 +66,8 @@
# pylint: disable=unused-argument
def GetUserSetting(self, **kwargs):
- return
- # return self.handler(**kwargs)
+ return self.handler(**kwargs)
# pylint: disable=unused-argument
def PostUserSetting(self, **kwargs):
- return
- # return self.handler(**kwargs)
+ return self.handler(**kwargs)