mirror of https://github.com/jumpserver/jumpserver
Perms return (#1293)
* [Update] 修改版本号 * [Update] 默认关闭定时任务 * [Update] 修改授权列表创建api,返回id * [Update] 修改用户名校验规则pull/1294/head
parent
1edfb1cec4
commit
01d136cf1e
|
@ -22,7 +22,7 @@ TIMEOUT = 60
|
|||
logger = get_logger(__file__)
|
||||
CACHE_MAX_TIME = 60*60*60
|
||||
disk_pattern = re.compile(r'^hd|sd|xvd|vd')
|
||||
PERIOD_TASK = os.environ.get("PERIOD_TASK", "on")
|
||||
PERIOD_TASK = os.environ.get("PERIOD_TASK", "off")
|
||||
|
||||
|
||||
@shared_task
|
||||
|
|
|
@ -4,4 +4,4 @@ from django.core.validators import RegexValidator
|
|||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
|
||||
alphanumeric = RegexValidator(r'^[0-9a-zA-Z_-]*$', _('Special char not allowed'))
|
||||
alphanumeric = RegexValidator(r'^[0-9a-zA-Z_@\-\.]*$', _('Special char not allowed'))
|
|
@ -9,7 +9,7 @@ from common.fields import StringManyToManyField
|
|||
class AssetPermissionCreateUpdateSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = AssetPermission
|
||||
exclude = ('id', 'created_by', 'date_created')
|
||||
exclude = ('created_by', 'date_created')
|
||||
|
||||
|
||||
class AssetPermissionListSerializer(serializers.ModelSerializer):
|
||||
|
|
Loading…
Reference in New Issue