浏览代码

Fix admin user edit (timezone manage)

Bastien Sevajol (Algoo) 8 年前
父节点
当前提交
f68472ccd0
共有 1 个文件被更改,包括 7 次插入3 次删除
  1. 7 3
      tracim/tracim/controllers/admin/user.py

+ 7 - 3
tracim/tracim/controllers/admin/user.py 查看文件

1
 # -*- coding: utf-8 -*-
1
 # -*- coding: utf-8 -*-
2
 import uuid
2
 import uuid
3
 
3
 
4
+import pytz
4
 from tracim import model  as pm
5
 from tracim import model  as pm
5
 
6
 
6
 from sprox.tablebase import TableBase
7
 from sprox.tablebase import TableBase
380
         user = api.get_one(id)
381
         user = api.get_one(id)
381
 
382
 
382
         dictified_user = Context(CTX.USER).toDict(user, 'user')
383
         dictified_user = Context(CTX.USER).toDict(user, 'user')
383
-        return DictLikeClass(result = dictified_user)
384
+        return DictLikeClass(
385
+            result=dictified_user,
386
+            timezones=pytz.all_timezones,
387
+        )
384
 
388
 
385
     @tg.require(predicates.in_group(Group.TIM_MANAGER_GROUPNAME))
389
     @tg.require(predicates.in_group(Group.TIM_MANAGER_GROUPNAME))
386
     @tg.expose()
390
     @tg.expose()
387
-    def put(self, user_id, name, email, next_url=''):
391
+    def put(self, user_id, name, email, timezone: str='', next_url=''):
388
         api = UserApi(tmpl_context.current_user)
392
         api = UserApi(tmpl_context.current_user)
389
 
393
 
390
         user = api.get_one(int(user_id))
394
         user = api.get_one(int(user_id))
391
-        api.update(user, name, email, True)
395
+        api.update(user, name, email, True, timezone=timezone)
392
 
396
 
393
         tg.flash(_('User {} updated.').format(user.get_display_name()), CST.STATUS_OK)
397
         tg.flash(_('User {} updated.').format(user.get_display_name()), CST.STATUS_OK)
394
         if next_url:
398
         if next_url: