summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2016-03-16 01:08:36 +0100
committeremkael <emkael@tlen.pl>2016-03-16 01:08:36 +0100
commitaa633881b411c81009d4e1d394d30c950da9c70f (patch)
tree8d0d3ce360994f57a597900d9b7857a85a3dc304 /app
parentfbca8e50c0d309fa37834ee64ba5c0c7a5732808 (diff)
* timezone preference information for users
Diffstat (limited to 'app')
-rw-r--r--app/php/model/User.php2
-rw-r--r--app/python/rcal/model.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/app/php/model/User.php b/app/php/model/User.php
index baa9912..d431183 100644
--- a/app/php/model/User.php
+++ b/app/php/model/User.php
@@ -11,6 +11,7 @@ class User extends ActiveRecord {
public $Login;
public $Password;
public $IsAdmin;
+ public $Timezone;
public $LastLogin;
public static $COLUMN_MAPPING = [
@@ -18,6 +19,7 @@ class User extends ActiveRecord {
'login' => 'Login',
'password' => 'Password',
'is_admin' => 'IsAdmin',
+ 'timezone' => 'Timezone',
'last_login' => 'LastLogin'
];
diff --git a/app/python/rcal/model.py b/app/python/rcal/model.py
index 3ecfceb..4ac212f 100644
--- a/app/python/rcal/model.py
+++ b/app/python/rcal/model.py
@@ -139,6 +139,7 @@ class User(BASE):
login = Column(String(255), unique=True, index=True)
password = Column(String(255))
is_admin = Column(Boolean)
+ timezone = Column(String(255))
last_login = Column(UTCDateTime)
calendars = relationship('Calendar',