|
@@ -1,4 +1,7 @@
|
|
|
# coding=utf-8
|
|
|
+
|
|
|
+import datetime
|
|
|
+from django.utils import timezone
|
|
|
from django.contrib.auth import get_user_model, authenticate
|
|
|
from django.db.models import F
|
|
|
|
|
@@ -147,6 +150,7 @@ class UserSerializer(serializers.ModelSerializer):
|
|
|
status_text = serializers.SerializerMethodField()
|
|
|
department_text = serializers.CharField(source='department.name', read_only=True)
|
|
|
type_text = serializers.SerializerMethodField()
|
|
|
+ online_text = serializers.SerializerMethodField()
|
|
|
|
|
|
class Meta:
|
|
|
model = User
|
|
@@ -164,6 +168,12 @@ class UserSerializer(serializers.ModelSerializer):
|
|
|
return u'普通'
|
|
|
return ''
|
|
|
|
|
|
+ def get_online_text(self, obj):
|
|
|
+ start = timezone.now() - datetime.timedelta(hours=0, minutes=10, seconds=0)
|
|
|
+ if obj.status == User.ONLINE and obj.last_refresh > start:
|
|
|
+ return '是'
|
|
|
+ return '否'
|
|
|
+
|
|
|
def create(self, validated_data):
|
|
|
if validated_data['password'].strip() == '':
|
|
|
raise CustomError(u'密码不能为空!')
|