Skip to content

J
jumpserver
Commit 08edda35 authored by ibuler's avatar ibuler
Browse files
Options

[Update] 完成资产书

parent c8728cac
Show whitespace changes
Inline Side-by-side
Showing with 615 additions and 903 deletions
apps/assets/api/node.py
View file @ 08edda35
......@@ -96,4 +96,5 @@ class NodeRemoveAssetsApi(generics.UpdateAPIView):
def perform_update(self, serializer):
assets = serializer.validated_data.get('assets')
instance = self.get_object()
if instance != Node.root():
instance.assets.remove(*tuple(assets))
apps/assets/forms/asset.py
View file @ 08edda35
......@@ -64,7 +64,10 @@ class AssetUpdateForm(forms.ModelForm):
'ip': '* required',
'port': '* required',
'cluster': '* required',
'admin_user': _('')
'admin_user': _(
'Admin user is a privilege user exist on this asset,'
'Example: root or other NOPASSWD sudo privilege user'
)
}
......
apps/assets/models/user.py
View file @ 08edda35
......@@ -238,6 +238,13 @@ class SystemUser(AssetUser):
'auto_push': self.auto_push,
}
@property
def assets(self):
assets = set()
for node in self.nodes.all():
assets.update(set(node.get_all_assets()))
return assets
@property
def assets_connective(self):
_result = cache.get(SYSTEM_USER_CONN_CACHE_KEY.format(self.name), {})
......
apps/assets/serializers/node.py
View file @ 08edda35
......@@ -14,11 +14,12 @@ class NodeGrantedSerializer(BulkSerializerMixin, serializers.ModelSerializer):
assets_granted = AssetGrantedSerializer(many=True, read_only=True)
assets_amount = serializers.SerializerMethodField()
parent = serializers.SerializerMethodField()
name = serializers.SerializerMethodField()
class Meta:
model = Node
fields = [
'id', 'key', 'value', 'parent',
'id', 'key', 'name', 'value', 'parent',
'assets_granted', 'assets_amount',
]
......@@ -26,6 +27,10 @@ class NodeGrantedSerializer(BulkSerializerMixin, serializers.ModelSerializer):
def get_assets_amount(obj):
return len(obj.assets_granted)
@staticmethod
def get_name(obj):
return obj.name
@staticmethod
def get_parent(obj):
return obj.parent.id
......
apps/assets/serializers/system_user.py
View file @ 08edda35
......@@ -33,8 +33,7 @@ class SystemUserSerializer(serializers.ModelSerializer):
@staticmethod
def get_assets_amount(obj):
amount = 0
return amount
return len(obj.assets)
class AssetSystemUserSerializer(serializers.ModelSerializer):
......
apps/assets/signals_handler.py
View file @ 08edda35
......@@ -24,9 +24,15 @@ def test_asset_conn_on_created(asset):
test_asset_connectability_util.delay(asset)
def set_asset_root_node(asset):
logger.debug("Set asset default node: {}".format(Node.root()))
asset.nodes.add(Node.root())
@receiver(post_save, sender=Asset, dispatch_uid="my_unique_identifier")
def on_asset_created(sender, instance=None, created=False, **kwargs):
if instance and created:
def on_asset_created_or_update(sender, instance=None, created=False, **kwargs):
set_asset_root_node(instance)
if created:
logger.info("Asset `{}` create signal received".format(instance))
update_asset_hardware_info_on_created(instance)
test_asset_conn_on_created(instance)
......
apps/assets/tasks.py
View file @ 08edda35
......@@ -166,6 +166,8 @@ def test_admin_user_connectability_util(admin_user, task_name):
assets = admin_user.get_related_assets()
hosts = [asset.hostname for asset in assets]
if not hosts:
return
tasks = const.TEST_ADMIN_USER_CONN_TASKS
task, created = update_or_create_ansible_task(
task_name=task_name, hosts=hosts, tasks=tasks, pattern='all',
......@@ -184,19 +186,10 @@ def test_admin_user_connectability_period():
"""
A period task that update the ansible task period
"""
from ops.utils import update_or_create_ansible_task
admin_users = AdminUser.objects.all()
for admin_user in admin_users:
task_name = _("Test admin user connectability period: {}").format(admin_user)
assets = admin_user.get_related_assets()
hosts = [asset.hostname for asset in assets]
tasks = const.TEST_ADMIN_USER_CONN_TASKS
update_or_create_ansible_task(
task_name=task_name, hosts=hosts, tasks=tasks, pattern='all',
options=const.TASK_OPTIONS, run_as_admin=True, created_by='System',
interval=3600, is_periodic=True,
callback=set_admin_user_connectability_info.name,
)
task_name = _("Test admin user connectability period: {}".format(admin_user.name))
test_admin_user_connectability_util(admin_user, task_name)
@shared_task
......@@ -262,23 +255,21 @@ def test_system_user_connectability_util(system_user, task_name):
:param task_name:
:return:
"""
# todo
# from ops.utils import update_or_create_ansible_task
# assets = system_user.get_clusters_assets()
# hosts = [asset.hostname for asset in assets]
# tasks = const.TEST_SYSTEM_USER_CONN_TASKS
# if not hosts:
# logger.info("No hosts, passed")
# return {}
# task, created = update_or_create_ansible_task(
# task_name, hosts=hosts, tasks=tasks, pattern='all',
# options=const.TASK_OPTIONS,
# run_as=system_user.name, created_by="System",
# )
# result = task.run()
# set_system_user_connectablity_info(result, system_user=system_user.name)
# return result
from ops.utils import update_or_create_ansible_task
assets = system_user.assets
hosts = [asset.hostname for asset in assets]
tasks = const.TEST_SYSTEM_USER_CONN_TASKS
if not hosts:
logger.info("No hosts, passed")
return {}
task, created = update_or_create_ansible_task(
task_name, hosts=hosts, tasks=tasks, pattern='all',
options=const.TASK_OPTIONS,
run_as=system_user.name, created_by="System",
)
result = task.run()
set_system_user_connectablity_info(result, system_user=system_user.name)
return result
@shared_task
......@@ -292,23 +283,10 @@ def test_system_user_connectability_manual(system_user):
@after_app_ready_start
@after_app_shutdown_clean
def test_system_user_connectability_period():
# Todo
pass
# from ops.utils import update_or_create_ansible_task
# system_users = SystemUser.objects.all()
# for system_user in system_users:
# task_name = _("Test system user connectability period: {}").format(
# system_user.name
# )
# assets = system_user.get_clusters_assets()
# hosts = [asset.hostname for asset in assets]
# tasks = const.TEST_SYSTEM_USER_CONN_TASKS
# update_or_create_ansible_task(
# task_name=task_name, hosts=hosts, tasks=tasks, pattern='all',
# options=const.TASK_OPTIONS, run_as_admin=False, run_as=system_user.name,
# created_by='System', interval=3600, is_periodic=True,
# callback=set_admin_user_connectability_info.name,
# )
system_users = SystemUser.objects.all()
for system_user in system_users:
task_name = _("test system user connectability period: {}".format(system_user))
test_system_user_connectability_util(system_user, task_name)
#### Push system user tasks ####
......@@ -416,10 +394,10 @@ def push_node_system_users_to_asset(node, assets):
push_system_user_util.delay(system_users, assets, task_name)
@shared_task
@register_as_period_task(interval=3600)
@after_app_ready_start
@after_app_shutdown_clean
def push_system_user_period():
for system_user in SystemUser.objects.all():
push_system_user_related_nodes(system_user)
# @shared_task
# @register_as_period_task(interval=3600)
# @after_app_ready_start
# # @after_app_shutdown_clean
# def push_system_user_period():
# for system_user in SystemUser.objects.all():
# push_system_user_related_nodes(system_user)
apps/assets/templates/assets/admin_user_list.html
View file @ 08edda35
......@@ -5,7 +5,7 @@
{% block help_message %}
<div class="alert alert-info help-message">
管理用户是 服务器上已存在的特权用户，Jumpserver使用该用户来 `推送系统用户`、`获取资产硬件信息`等。可以设置主机级别管理用户，也设置集群级别管理用户，这样资产可以不用再单独设置
管理用户是 服务器上已存在的特权用户，Jumpserver使用该用户来 `推送系统用户`、`获取资产硬件信息`等。
</div>
{% endblock %}
......
apps/assets/templates/assets/asset_list.html
View file @ 08edda35
......@@ -5,6 +5,7 @@
{% block custom_head_css_js %}
<link href="{% static 'css/plugins/ztree/awesomeStyle/awesome.css' %}" rel="stylesheet">
<script type="text/javascript" src="{% static 'js/plugins/ztree/jquery.ztree.all.min.js' %}"></script>
<script src="{% static 'js/jquery.form.min.js' %}"></script>
<style type="text/css">
div#rMenu {
position:absolute;
......
apps/assets/templates/assets/system_user_detail.html
View file @ 08edda35
......@@ -289,5 +289,29 @@ $(document).ready(function () {
var redirect_url = "{% url 'assets:system-user-list' %}";
objectDelete($this, name, the_url, redirect_url);
})
.on('click', '.btn-push', function () {
var the_url = "{% url 'api-assets:system-user-push' pk=system_user.id %}";
var error = function (data) {
alert(data)
};
APIUpdateAttr({
url: the_url,
error: error,
method: 'GET',
success_message: "{% trans "Task has been send, Go to ops task list seen result" %}"
});
})
.on('click', '.btn-test-connective', function () {
var the_url = "{% url 'api-assets:system-user-connective' pk=system_user.id %}";
var error = function (data) {
alert(data)
};
APIUpdateAttr({
url: the_url,
error: error,
method: 'GET',
success_message: "{% trans "Task has been send, seen left assets status" %}"
});
})
</script>
{% endblock %}
apps/assets/templates/assets/system_user_list.html
View file @ 08edda35
......@@ -4,7 +4,7 @@
{% block help_message %}
<div class="alert alert-info help-message">
系统用户是 用户登录资产(服务器)时使用的用户，如 web, sa, dba等具有特殊功能的用户。系统用户创建时，如果选择了自动推送
Jumpserver会使用ansible自动推送到系统用户所在集群的资产中，如果资产(交换机)不支持ansible, 请手动填写账号密码。
Jumpserver会使用ansible自动推送系统用户到资产中，如果资产(交换机、windows)不支持ansible, 请手动填写账号密码。
</div>
{% endblock %}
......
apps/assets/views/asset.py
View file @ 08edda35
......@@ -213,22 +213,19 @@ class AssetExportView(View):
]
]
filename = 'assets-{}.csv'.format(
timezone.localtime(timezone.now()).strftime('%Y-%m-%d_%H-%M-%S'))
timezone.localtime(timezone.now()).strftime('%Y-%m-%d_%H-%M-%S')
)
response = HttpResponse(content_type='text/csv')
response['Content-Disposition'] = 'attachment; filename="%s"' % filename
response.write(codecs.BOM_UTF8)
assets = Asset.objects.filter(id__in=assets_id)
writer = csv.writer(response, dialect='excel',
quoting=csv.QUOTE_MINIMAL)
writer = csv.writer(response, dialect='excel', quoting=csv.QUOTE_MINIMAL)
header = [field.verbose_name for field in fields]
header.append(_('Asset groups'))
writer.writerow(header)
for asset in assets:
groups = ','.join([group.name for group in asset.groups.all()])
data = [getattr(asset, field.name) for field in fields]
data.append(groups)
writer.writerow(data)
return response
......@@ -262,7 +259,6 @@ class BulkImportAssetView(AdminUserRequiredMixin, JSONResponseMixin, FormView):
]
header_ = csv_data[0]
mapping_reverse = {field.verbose_name: field.name for field in fields}
mapping_reverse[_('Asset groups')] = 'groups'
attr = [mapping_reverse.get(n, None) for n in header_]
if None in attr:
data = {'valid': False,
......@@ -279,20 +275,15 @@ class BulkImportAssetView(AdminUserRequiredMixin, JSONResponseMixin, FormView):
asset_dict = dict(zip(attr, row))
id_ = asset_dict.pop('id', 0)
for k, v in asset_dict.items():
if k == 'cluster':
v = get_object_or_none(Cluster, name=v)
elif k == 'is_active':
v = bool(v)
if k == 'is_active':
v = True if v in ['TRUE', 1, 'true'] else False
elif k == 'admin_user':
v = get_object_or_none(AdminUser, name=v)
elif k in ['port', 'cabinet_pos', 'cpu_count', 'cpu_cores']:
elif k in ['port', 'cpu_count', 'cpu_cores']:
try:
v = int(v)
except ValueError:
v = 0
elif k == 'groups':
groups_name = v.split(',')
v = AssetGroup.objects.filter(name__in=groups_name)
else:
continue
asset_dict[k] = v
......@@ -300,20 +291,15 @@ class BulkImportAssetView(AdminUserRequiredMixin, JSONResponseMixin, FormView):
asset = get_object_or_none(Asset, id=id_) if is_uuid(id_) else None
if not asset:
try:
groups = asset_dict.pop('groups')
if len(Asset.objects.filter(hostname=asset_dict.get('hostname'))):
raise Exception(_('already exists'))
asset = Asset.objects.create(**asset_dict)
asset.groups.set(groups)
created.append(asset_dict['hostname'])
assets.append(asset)
except Exception as e:
failed.append('%s: %s' % (asset_dict['hostname'], str(e)))
else:
for k, v in asset_dict.items():
if k == 'groups':
asset.groups.set(v)
continue
if v:
setattr(asset, k, v)
try:
......
apps/i18n/zh/LC_MESSAGES/django.po
View file @ 08edda35
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Jumpserver 0.3.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-01 12:36+0800\n"
"POT-Creation-Date: 2018-02-09 15:27+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: Jumpserver team<ibuler@qq.com>\n"
......@@ -17,115 +17,106 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: assets/forms.py:21 assets/forms.py:67 assets/forms.py:127 perms/forms.py:37
#: perms/templates/perms/asset_permission_asset.html:116 users/forms.py:245
msgid "Select asset groups"
msgstr "选择资产组"
#: assets/api/node.py:54
msgid "New node {}"
msgstr "新节点 {}"
#: assets/forms.py:24 assets/forms.py:70 assets/forms.py:115
#: assets/templates/assets/admin_user_detail.html:92
msgid "Select cluster"
msgstr "选择集群"
#: assets/forms.py:27 assets/forms.py:73
msgid "Select admin user"
msgstr "选择管理用户"
#: assets/forms/asset.py:23 assets/forms/asset.py:52 assets/forms/asset.py:102
#: assets/forms/user.py:125 assets/models/asset.py:45 assets/models/user.py:221
#: assets/templates/assets/admin_user_detail.html:91
#: assets/templates/assets/asset_detail.html:181
#: assets/templates/assets/asset_detail.html:189
#: assets/templates/assets/system_user_detail.html:164
msgid "Nodes"
msgstr "节点管理"
#: assets/forms.py:30 assets/forms.py:76 assets/forms.py:130
#: assets/templates/assets/asset_create.html:36
msgid "Select labels"
msgstr "选择标签"
#: assets/forms/asset.py:26 assets/forms/asset.py:55 assets/forms/asset.py:96
#: assets/models/asset.py:49 assets/models/cluster.py:19
#: assets/models/user.py:190 assets/templates/assets/asset_detail.html:73
#: templates/_nav.html:23
msgid "Admin user"
msgstr "管理用户"
#: assets/forms.py:39 assets/forms.py:85
msgid "Host level admin user, If not set using cluster admin user default"
msgstr "主机级别管理用户，如果没有设置则默认使用集群级别管理用户"
#: assets/forms/asset.py:29 assets/forms/asset.py:58 assets/forms/asset.py:99
#: assets/models/asset.py:73 assets/templates/assets/asset_create.html:31
#: assets/templates/assets/asset_detail.html:218
#: assets/templates/assets/asset_update.html:36 templates/_nav.html:25
msgid "Labels"
msgstr "标签管理"
#: assets/forms.py:46 assets/forms.py:92
msgid "You need set a admin user if cluster not have"
msgstr "集群没有管理用户，你需要为集群设置管理用户或设置一个主机级别的管理用户"
#: assets/forms/asset.py:37 assets/forms/asset.py:68
msgid ""
"Admin user is a privilege user exist on this asset,Example: root or other "
"NOPASSWD sudo privilege user"
msgstr "管理用户是资产上已经存在的特权用户，如 root或者其它有NOPASSWD的用户"
#: assets/forms.py:99 assets/forms.py:103 assets/forms.py:163
#: assets/forms.py:358 assets/templates/assets/asset_group_detail.html:74
#: perms/forms.py:34 perms/templates/perms/asset_permission_asset.html:88
#: users/forms.py:242
#: assets/forms/asset.py:77 assets/forms/asset.py:81 assets/forms/label.py:15
#: perms/templates/perms/asset_permission_asset.html:88 users/forms.py:242
msgid "Select assets"
msgstr "选择资产"
#: assets/forms.py:108 assets/models/asset.py:36
#: assets/templates/assets/admin_user_assets.html:61
#: assets/forms/asset.py:86 assets/models/asset.py:44
#: assets/templates/assets/admin_user_assets.html:53
#: assets/templates/assets/asset_detail.html:69
#: assets/templates/assets/asset_group_detail.html:52
#: assets/templates/assets/asset_list.html:40
#: assets/templates/assets/cluster_assets.html:53
#: assets/templates/assets/system_user_asset.html:54
#: assets/templates/assets/system_user_asset.html:51
#: assets/templates/assets/user_asset_list.html:21
#: users/templates/users/user_group_granted_asset.html:51
msgid "Port"
msgstr "端口"
#: assets/forms.py:111 assets/models/asset.py:38 assets/models/cluster.py:40
#: assets/models/user.py:219 assets/templates/assets/asset_detail.html:81
#: assets/templates/assets/asset_list.html:41 templates/_nav.html:24
msgid "Cluster"
msgstr "集群"
#: assets/forms.py:160 assets/forms.py:356 assets/models/asset.py:147
#: assets/forms/label.py:13 assets/models/asset.py:137
#: assets/templates/assets/admin_user_list.html:24
#: assets/templates/assets/asset_group_list.html:16
#: assets/templates/assets/label_list.html:16
#: assets/templates/assets/system_user_list.html:26 perms/models.py:17
#: perms/templates/perms/asset_permission_create_update.html:40
#: perms/templates/perms/asset_permission_list.html:28 templates/_nav.html:22
#: terminal/backends/command/models.py:11 terminal/models.py:116
#: terminal/templates/terminal/command_list.html:40
#: terminal/templates/terminal/command_list.html:73
#: terminal/templates/terminal/session_list.html:41
#: terminal/templates/terminal/session_list.html:72
#: users/templates/users/user_granted_asset.html:82
#: users/templates/users/user_group_granted_asset.html:86
msgid "Asset"
msgstr "资产"
#: assets/forms.py:197 perms/forms.py:40
#: perms/templates/perms/asset_permission_detail.html:144 users/forms.py:248
msgid "Select system users"
msgstr "选择系统用户"
#: assets/forms/user.py:24
msgid "Password or private key passphrase"
msgstr "密码或秘钥密码"
#: assets/forms.py:199
#: assets/templates/assets/_asset_group_bulk_update_modal.html:22
#: assets/templates/assets/cluster_list.html:22
msgid "System users"
msgstr "系统用户"
#: assets/forms/user.py:25 assets/models/user.py:30 common/forms.py:113
#: users/forms.py:16 users/forms.py:24 users/templates/users/login.html:56
#: users/templates/users/reset_password.html:52
#: users/templates/users/user_create.html:11
#: users/templates/users/user_password_update.html:40
#: users/templates/users/user_profile_update.html:40
#: users/templates/users/user_pubkey_update.html:40
msgid "Password"
msgstr "密码"
#: assets/forms.py:201
msgid "Selected system users will be create at cluster assets"
msgstr "选择的系统用户将会在该集群资产上创建"
#: assets/forms/user.py:28 users/models/user.py:45
msgid "Private key"
msgstr "ssh私钥"
#: assets/forms.py:209 assets/forms.py:291 assets/forms.py:332
#: assets/models/cluster.py:18 assets/models/group.py:20
#: assets/models/label.py:17 assets/models/user.py:28
#: assets/forms/user.py:38
msgid "Invalid private key"
msgstr "ssh密钥不合法"
#: assets/forms/user.py:47
msgid "Password and private key file must be input one"
msgstr "密码和私钥, 必须输入一个"
#: assets/forms/user.py:79 assets/forms/user.py:120 assets/models/cluster.py:18
#: assets/models/group.py:20 assets/models/label.py:17 assets/models/user.py:28
#: assets/templates/assets/admin_user_detail.html:56
#: assets/templates/assets/admin_user_list.html:22
#: assets/templates/assets/asset_group_list.html:15
#: assets/templates/assets/cluster_detail.html:57
#: assets/templates/assets/cluster_list.html:19
#: assets/templates/assets/label_list.html:14
#: assets/templates/assets/system_user_detail.html:58
#: assets/templates/assets/system_user_list.html:24 common/models.py:26
#: common/templates/common/terminal_setting.html:62 ops/models.py:31
#: ops/templates/ops/task_detail.html:56 ops/templates/ops/task_list.html:34
#: perms/models.py:14
#: perms/templates/perms/asset_permission_create_update.html:33
#: perms/templates/perms/asset_permission_detail.html:62
#: perms/templates/perms/asset_permission_list.html:25
#: perms/models.py:14 perms/templates/perms/asset_permission_detail.html:62
#: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:15
#: terminal/models.py:141 terminal/templates/terminal/terminal_detail.html:43
#: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14
#: users/models/user.py:35 users/templates/users/_select_user_modal.html:13
#: users/templates/users/user_detail.html:63
#: users/templates/users/user_granted_asset.html:81
#: users/templates/users/user_group_detail.html:55
#: users/templates/users/user_group_granted_asset.html:85
#: users/templates/users/user_group_list.html:12
#: users/templates/users/user_list.html:23
#: users/templates/users/user_profile.html:51
......@@ -133,37 +124,7 @@ msgstr "选择的系统用户将会在该集群资产上创建"
msgid "Name"
msgstr "名称"
#: assets/forms.py:215
msgid "Cluster level admin user"
msgstr "集群级别管理用户"
#: assets/forms.py:236
msgid "Password or private key passphrase"
msgstr "密码或秘钥密码"
#: assets/forms.py:237 assets/models/user.py:30 common/forms.py:113
#: users/forms.py:16 users/forms.py:24 users/templates/users/login.html:56
#: users/templates/users/reset_password.html:52
#: users/templates/users/user_create.html:11
#: users/templates/users/user_password_update.html:40
#: users/templates/users/user_profile_update.html:40
#: users/templates/users/user_pubkey_update.html:40
msgid "Password"
msgstr "密码"
#: assets/forms.py:240 users/models/user.py:45
msgid "Private key"
msgstr "ssh私钥"
#: assets/forms.py:250
msgid "Invalid private key"
msgstr "ssh密钥不合法"
#: assets/forms.py:259
msgid "Password and private key file must be input one"
msgstr "密码和私钥, 必须输入一个"
#: assets/forms.py:292 assets/forms.py:333 assets/models/user.py:29
#: assets/forms/user.py:80 assets/forms/user.py:121 assets/models/user.py:29
#: assets/templates/assets/admin_user_detail.html:60
#: assets/templates/assets/admin_user_list.html:23
#: assets/templates/assets/system_user_detail.html:62
......@@ -179,171 +140,146 @@ msgstr "密码和私钥, 必须输入一个"
msgid "Username"
msgstr "用户名"
#: assets/forms.py:337
msgid " Select clusters"
msgstr "选择集群"
#: assets/forms.py:344
msgid "If auto push checked, system user will be create at cluster assets"
msgstr "如果选择了自动推送，系统用户将会创建在集群资产上"
#: assets/forms/user.py:132
msgid "If auto push checked, system user will be create at node assets"
msgstr "如果选择了自动推送，系统用户将会创建在节点资产上"
#: assets/forms.py:345
#: assets/forms/user.py:133
msgid "Auto push system user to asset"
msgstr "自动推送系统用户到资产"
#: assets/forms.py:346
#: assets/forms/user.py:134
msgid ""
"High level will be using login asset as default, if user was granted more "
"than 2 system user"
msgstr "高优先级的系统用户将会作为默认登录用户"
#: assets/models/asset.py:34 assets/templates/assets/admin_user_assets.html:60
#: assets/models/asset.py:42 assets/templates/assets/_asset_list_modal.html:21
#: assets/templates/assets/admin_user_assets.html:52
#: assets/templates/assets/asset_detail.html:61
#: assets/templates/assets/asset_group_detail.html:51
#: assets/templates/assets/asset_list.html:39
#: assets/templates/assets/cluster_assets.html:52
#: assets/templates/assets/system_user_asset.html:53
#: assets/templates/assets/asset_list.html:75
#: assets/templates/assets/system_user_asset.html:50
#: assets/templates/assets/user_asset_list.html:20 common/forms.py:143
#: perms/templates/perms/asset_permission_asset.html:55
#: users/templates/users/login_log_list.html:52
#: users/templates/users/user_granted_asset.html:49
#: users/templates/users/user_group_granted_asset.html:50
#: users/templates/users/user_granted_asset.html:45
#: users/templates/users/user_group_granted_asset.html:45
msgid "IP"
msgstr "IP"
#: assets/models/asset.py:35 assets/templates/assets/admin_user_assets.html:59
#: assets/models/asset.py:43 assets/templates/assets/_asset_list_modal.html:20
#: assets/templates/assets/admin_user_assets.html:51
#: assets/templates/assets/asset_detail.html:57
#: assets/templates/assets/asset_group_detail.html:50
#: assets/templates/assets/asset_list.html:38
#: assets/templates/assets/cluster_assets.html:51
#: assets/templates/assets/system_user_asset.html:52
#: assets/templates/assets/asset_list.html:74
#: assets/templates/assets/system_user_asset.html:49
#: assets/templates/assets/user_asset_list.html:19 common/forms.py:142
#: perms/templates/perms/asset_permission_asset.html:54
#: users/templates/users/user_granted_asset.html:48
#: users/templates/users/user_group_granted_asset.html:49
#: users/templates/users/user_granted_asset.html:44
#: users/templates/users/user_group_granted_asset.html:44
msgid "Hostname"
msgstr "主机名"
#: assets/models/asset.py:37 assets/templates/assets/asset_detail.html:189
#: assets/views/asset.py:220 assets/views/asset.py:260
msgid "Asset groups"
msgstr "资产组"
#: assets/models/asset.py:39 assets/models/label.py:20
#: assets/templates/assets/asset_detail.html:113
#: assets/models/asset.py:46 assets/models/label.py:20
#: assets/templates/assets/asset_detail.html:105
#: perms/templates/perms/asset_permission_list.html:65
msgid "Is active"
msgstr "激活"
#: assets/models/asset.py:42 assets/models/cluster.py:19
#: assets/models/user.py:190 assets/templates/assets/asset_detail.html:73
#: assets/templates/assets/cluster_list.html:20 templates/_nav.html:25
msgid "Admin user"
msgstr "管理用户"
#: assets/models/asset.py:45 assets/templates/assets/asset_detail.html:65
#: assets/models/asset.py:52 assets/templates/assets/asset_detail.html:65
msgid "Public IP"
msgstr "公网IP"
#: assets/models/asset.py:46 assets/templates/assets/asset_detail.html:121
#: assets/models/asset.py:53 assets/templates/assets/asset_detail.html:113
msgid "Asset number"
msgstr "资产编号"
#: assets/models/asset.py:49 assets/templates/assets/asset_detail.html:85
#: assets/models/asset.py:56 assets/templates/assets/asset_detail.html:77
msgid "Vendor"
msgstr "制造商"
#: assets/models/asset.py:50 assets/templates/assets/asset_detail.html:89
#: assets/models/asset.py:57 assets/templates/assets/asset_detail.html:81
msgid "Model"
msgstr "型号"
#: assets/models/asset.py:51 assets/templates/assets/asset_detail.html:117
#: assets/models/asset.py:58 assets/templates/assets/asset_detail.html:109
msgid "Serial number"
msgstr "序列号"
#: assets/models/asset.py:53
#: assets/models/asset.py:60
msgid "CPU model"
msgstr "CPU型号"
#: assets/models/asset.py:54
#: assets/models/asset.py:61
msgid "CPU count"
msgstr "CPU数量"
#: assets/models/asset.py:55
#: assets/models/asset.py:62
msgid "CPU cores"
msgstr "CPU核数"
#: assets/models/asset.py:56 assets/templates/assets/asset_detail.html:97
#: assets/models/asset.py:63 assets/templates/assets/asset_detail.html:89
msgid "Memory"
msgstr "内存"
#: assets/models/asset.py:57
#: assets/models/asset.py:64
msgid "Disk total"
msgstr "硬盘大小"
#: assets/models/asset.py:58
#: assets/models/asset.py:65
msgid "Disk info"
msgstr "硬盘信息"
#: assets/models/asset.py:60 assets/templates/assets/asset_detail.html:105
#: assets/models/asset.py:67 assets/templates/assets/asset_detail.html:97
msgid "Platform"
msgstr "系统平台"
#: assets/models/asset.py:61 assets/templates/assets/asset_detail.html:109
#: assets/models/asset.py:68 assets/templates/assets/asset_detail.html:101
msgid "OS"
msgstr "操作系统"
#: assets/models/asset.py:62
#: assets/models/asset.py:69
msgid "OS version"
msgstr "系统版本"
#: assets/models/asset.py:63
#: assets/models/asset.py:70
msgid "OS arch"
msgstr "系统架构"
#: assets/models/asset.py:64
#: assets/models/asset.py:71
msgid "Hostname raw"
msgstr "主机名原始"
#: assets/models/asset.py:66 assets/templates/assets/asset_create.html:32
#: assets/templates/assets/asset_detail.html:226
#: assets/templates/assets/asset_update.html:37 templates/_nav.html:27
msgid "Labels"
msgstr "标签管理"
#: assets/models/asset.py:67 assets/models/cluster.py:28
#: assets/models/asset.py:74 assets/models/cluster.py:28
#: assets/models/group.py:21 assets/models/user.py:36
#: assets/templates/assets/admin_user_detail.html:68
#: assets/templates/assets/asset_detail.html:125
#: assets/templates/assets/cluster_detail.html:93
#: assets/templates/assets/asset_detail.html:117
#: assets/templates/assets/system_user_detail.html:96
#: ops/templates/ops/adhoc_detail.html:86 perms/models.py:22
#: ops/templates/ops/adhoc_detail.html:86 perms/models.py:22 perms/models.py:79
#: perms/templates/perms/asset_permission_detail.html:94
#: users/models/user.py:50 users/templates/users/user_detail.html:99
msgid "Created by"
msgstr "创建者"
#: assets/models/asset.py:68 assets/models/cluster.py:26
#: assets/models/asset.py:75 assets/models/cluster.py:26
#: assets/models/group.py:22 assets/models/label.py:23
#: assets/templates/assets/admin_user_detail.html:64
#: assets/templates/assets/cluster_detail.html:89
#: assets/templates/assets/system_user_detail.html:92
#: ops/templates/ops/adhoc_detail.html:90 ops/templates/ops/task_detail.html:60
#: perms/models.py:23 perms/templates/perms/asset_permission_detail.html:90
#: perms/models.py:23 perms/models.py:80
#: perms/templates/perms/asset_permission_detail.html:90
#: terminal/templates/terminal/terminal_detail.html:59 users/models/group.py:17
#: users/templates/users/user_group_detail.html:63
msgid "Date created"
msgstr "创建日期"
#: assets/models/asset.py:69 assets/models/cluster.py:29
#: assets/models/asset.py:76 assets/models/cluster.py:29
#: assets/models/group.py:23 assets/models/label.py:21 assets/models/user.py:33
#: assets/templates/assets/admin_user_detail.html:72
#: assets/templates/assets/admin_user_list.html:28
#: assets/templates/assets/asset_detail.html:133
#: assets/templates/assets/asset_group_list.html:17
#: assets/templates/assets/cluster_detail.html:97
#: assets/templates/assets/asset_detail.html:125
#: assets/templates/assets/system_user_detail.html:100
#: assets/templates/assets/system_user_list.html:30 common/models.py:30
#: ops/models.py:37 perms/models.py:24
#: ops/models.py:37 perms/models.py:24 perms/models.py:81
#: perms/templates/perms/asset_permission_detail.html:98 terminal/models.py:25
#: terminal/templates/terminal/terminal_detail.html:63 users/models/group.py:15
#: users/models/user.py:47 users/templates/users/user_detail.html:111
......@@ -353,32 +289,32 @@ msgstr "创建日期"
msgid "Comment"
msgstr "备注"
#: assets/models/cluster.py:20 assets/templates/assets/cluster_detail.html:61
#: assets/models/cluster.py:20
msgid "Bandwidth"
msgstr "带宽"
#: assets/models/cluster.py:21 assets/templates/assets/cluster_detail.html:65
#: assets/models/cluster.py:21
msgid "Contact"
msgstr "联系人"
#: assets/models/cluster.py:22 assets/templates/assets/cluster_detail.html:69
#: users/models/user.py:41 users/templates/users/user_detail.html:76
#: assets/models/cluster.py:22 users/models/user.py:41
#: users/templates/users/user_detail.html:76
msgid "Phone"
msgstr "手机"
#: assets/models/cluster.py:23 assets/templates/assets/cluster_detail.html:73
#: assets/models/cluster.py:23
msgid "Address"
msgstr "地址"
#: assets/models/cluster.py:24 assets/templates/assets/cluster_detail.html:77
#: assets/models/cluster.py:24
msgid "Intranet"
msgstr "内网"
#: assets/models/cluster.py:25 assets/templates/assets/cluster_detail.html:81
#: assets/models/cluster.py:25
msgid "Extranet"
msgstr "外网"
#: assets/models/cluster.py:27 assets/templates/assets/cluster_detail.html:85
#: assets/models/cluster.py:27
msgid "Operator"
msgstr "运营商"
......@@ -387,7 +323,7 @@ msgid "Default"
msgstr "默认"
#: assets/models/cluster.py:36 assets/models/label.py:13
#: users/models/user.py:258
#: users/models/user.py:261
msgid "System"
msgstr "系统"
......@@ -395,8 +331,11 @@ msgstr "系统"
msgid "Default Cluster"
msgstr "默认Cluster"
#: assets/models/cluster.py:40
msgid "Cluster"
msgstr "集群"
#: assets/models/group.py:30 perms/models.py:18
#: perms/templates/perms/asset_permission_list.html:29 templates/_nav.html:23
msgid "Asset group"
msgstr "资产组"
......@@ -404,21 +343,19 @@ msgstr "资产组"
msgid "Default asset group"
msgstr "默认资产组"
#: assets/models/label.py:14 perms/forms.py:18 perms/models.py:15
#: perms/templates/perms/asset_permission_create_update.html:36
#: perms/templates/perms/asset_permission_list.html:26 templates/_nav.html:12
#: assets/models/label.py:14 perms/models.py:15
#: terminal/backends/command/models.py:10 terminal/models.py:115
#: terminal/templates/terminal/command_list.html:32
#: terminal/templates/terminal/command_list.html:72
#: terminal/templates/terminal/session_list.html:33
#: terminal/templates/terminal/session_list.html:71 users/forms.py:190
#: users/models/user.py:30 users/templates/users/user_group_detail.html:78
#: users/templates/users/user_group_list.html:13 users/views/user.py:337
#: users/templates/users/user_group_list.html:13 users/views/user.py:333
msgid "User"
msgstr "用户"
#: assets/models/label.py:18 assets/templates/assets/label_list.html:15
#: common/models.py:27
#: assets/models/label.py:18 assets/models/node.py:15
#: assets/templates/assets/label_list.html:15 common/models.py:27
msgid "Value"
msgstr "值"
......@@ -426,6 +363,10 @@ msgstr "值"
msgid "Category"
msgstr "分类"
#: assets/models/node.py:14
msgid "Key"
msgstr ""
#: assets/models/user.py:31
msgid "SSH private key"
msgstr "ssh密钥"
......@@ -434,38 +375,36 @@ msgstr "ssh密钥"
msgid "SSH public key"
msgstr "ssh公钥"
#: assets/models/user.py:220
#: assets/models/user.py:222
msgid "Priority"
msgstr "优先级"
#: assets/models/user.py:221 assets/templates/assets/system_user_detail.html:66
#: assets/models/user.py:223 assets/templates/assets/system_user_detail.html:66
msgid "Protocol"
msgstr "协议"
#: assets/models/user.py:222 assets/templates/assets/_system_user.html:59
#: assets/models/user.py:224 assets/templates/assets/_system_user.html:58
#: assets/templates/assets/system_user_detail.html:118
#: assets/templates/assets/system_user_update.html:11
msgid "Auto push"
msgstr "自动推送"
#: assets/models/user.py:223 assets/templates/assets/system_user_detail.html:70
#: assets/models/user.py:225 assets/templates/assets/system_user_detail.html:70
msgid "Sudo"
msgstr "Sudo"
#: assets/models/user.py:224 assets/templates/assets/system_user_detail.html:75
#: assets/models/user.py:226 assets/templates/assets/system_user_detail.html:75
msgid "Shell"
msgstr "Shell"
#: assets/models/user.py:269 perms/models.py:19
#: perms/templates/perms/asset_permission_detail.html:136
#: perms/templates/perms/asset_permission_list.html:30 templates/_nav.html:26
#: assets/models/user.py:262 perms/forms.py:25 perms/models.py:19
#: perms/models.py:76 perms/templates/perms/asset_permission_detail.html:136
#: perms/templates/perms/asset_permission_list.html:64 templates/_nav.html:24
#: terminal/backends/command/models.py:12 terminal/models.py:117
#: terminal/templates/terminal/command_list.html:48
#: terminal/templates/terminal/command_list.html:74
#: terminal/templates/terminal/session_list.html:49
#: terminal/templates/terminal/session_list.html:73
#: users/templates/users/user_granted_asset.html:50
#: users/templates/users/user_group_granted_asset.html:52
msgid "System user"
msgstr "系统用户"
......@@ -474,18 +413,6 @@ msgstr "系统用户"
msgid "%(value)s is not an even number"
msgstr "%(value)s is not an even number"
#: assets/signals_handler.py:31
msgid "Push cluster system users to asset"
msgstr "推送集群系统用户到资产"
#: assets/signals_handler.py:63 assets/signals_handler.py:125
msgid "Push system user to cluster assets: {}->{}"
msgstr "推送系统用户到: {}->{}"
#: assets/signals_handler.py:102
msgid "Push system user to assets"
msgstr "推送系统用户到资产"
#: assets/tasks.py:92
msgid "Update some assets hardware info"
msgstr "更新一些资产硬件信息"
......@@ -510,21 +437,17 @@ msgstr "测试管理用户可连接性: {}"
msgid "Test asset connectability"
msgstr "测试资产可连接性"
#: assets/tasks.py:284
#: assets/tasks.py:286
msgid "Test system user connectability: {}"
msgstr "测试系统用户可连接性: {}"
#: assets/tasks.py:296
msgid "Test system user connectability period: {}"
msgstr "定期测试系统用户可连接性: {}"
#: assets/tasks.py:377
msgid "Push system user to cluster assets: {}"
msgstr "推送系统用户到资产: {}"
#: assets/tasks.py:383
msgid "Push system user to node: {} => {}"
msgstr "推送系统用户到节点: {}->{}"
#: assets/tasks.py:398
msgid "Push cluster system users to assets period: {}"
msgstr "定期推送集群系统用户到资产: {}"
#: assets/tasks.py:415
msgid "Push system users to node: {}"
msgstr "推送系统用户到节点: {}"
#: assets/templates/assets/_asset_group_bulk_update_modal.html:5
msgid "Update asset group"
......@@ -534,32 +457,33 @@ msgstr "编辑用户组"
msgid "Hint: only change the field you want to update."
msgstr "仅修改你需要更新的字段"
#: assets/templates/assets/_asset_group_bulk_update_modal.html:12
#: assets/templates/assets/_asset_group_bulk_update_modal.html:11
#: assets/templates/assets/system_user_asset.html:21
#: assets/views/admin_user.py:29 assets/views/admin_user.py:47
#: assets/views/admin_user.py:63 assets/views/admin_user.py:79
#: assets/views/admin_user.py:106 assets/views/asset.py:48
#: assets/views/asset.py:62 assets/views/asset.py:86 assets/views/asset.py:146
#: assets/views/asset.py:163 assets/views/asset.py:187
#: assets/views/cluster.py:26 assets/views/cluster.py:80
#: assets/views/cluster.py:97 assets/views/group.py:34 assets/views/group.py:52
#: assets/views/group.py:69 assets/views/group.py:87 assets/views/label.py:26
#: assets/views/admin_user.py:63 assets/views/admin_user.py:78
#: assets/views/admin_user.py:102 assets/views/asset.py:47
#: assets/views/asset.py:60 assets/views/asset.py:94 assets/views/asset.py:154
#: assets/views/asset.py:171 assets/views/asset.py:195 assets/views/label.py:26
#: assets/views/label.py:42 assets/views/label.py:58
#: assets/views/system_user.py:28 assets/views/system_user.py:44
#: assets/views/system_user.py:60 assets/views/system_user.py:75
#: assets/views/system_user.py:60 assets/views/system_user.py:74
#: templates/_nav.html:19
msgid "Assets"
msgstr "资产管理"
#: assets/templates/assets/_asset_group_bulk_update_modal.html:14
#: assets/templates/assets/_asset_group_bulk_update_modal.html:13
msgid "Select Asset"
msgstr "选择资产"
#: assets/templates/assets/_asset_group_bulk_update_modal.html:24
#: assets/templates/assets/_asset_group_bulk_update_modal.html:21
msgid "System users"
msgstr "系统用户"
#: assets/templates/assets/_asset_group_bulk_update_modal.html:23
msgid "Select System Users"
msgstr "选择系统用户"
#: assets/templates/assets/_asset_group_bulk_update_modal.html:35
#: assets/templates/assets/_asset_group_bulk_update_modal.html:34
msgid "Enable-OTP"
msgstr "二次验证"
......@@ -585,6 +509,144 @@ msgstr "资产csv文件"
msgid "If set id, will use this id update asset existed"
msgstr "如果设置了id，则会使用该行信息更新该id的资产"
#: assets/templates/assets/_asset_list_modal.html:22
#: assets/templates/assets/asset_list.html:76
#: assets/templates/assets/user_asset_list.html:22
msgid "Hardware"
msgstr "硬件"
#: assets/templates/assets/_asset_list_modal.html:23
#: assets/templates/assets/asset_detail.html:143
#: assets/templates/assets/asset_list.html:77
#: assets/templates/assets/user_asset_list.html:23 perms/models.py:20
#: perms/models.py:77
#: perms/templates/perms/asset_permission_create_update.html:51
#: perms/templates/perms/asset_permission_detail.html:116
#: terminal/templates/terminal/terminal_list.html:34
#: users/templates/users/_select_user_modal.html:18
#: users/templates/users/user_detail.html:128
#: users/templates/users/user_granted_asset.html:46
#: users/templates/users/user_group_granted_asset.html:46
#: users/templates/users/user_list.html:27
#: users/templates/users/user_profile.html:63
msgid "Active"
msgstr "激活中"
#: assets/templates/assets/_asset_list_modal.html:24
#: assets/templates/assets/admin_user_assets.html:54
#: assets/templates/assets/admin_user_list.html:25
#: assets/templates/assets/asset_detail.html:357
#: assets/templates/assets/asset_list.html:78
#: assets/templates/assets/system_user_asset.html:52
#: assets/templates/assets/system_user_list.html:27
#: users/templates/users/user_granted_asset.html:47
#: users/templates/users/user_group_granted_asset.html:47
msgid "Reachable"
msgstr "可连接"
#: assets/templates/assets/_asset_list_modal.html:25
#: assets/templates/assets/admin_user_list.html:29
#: assets/templates/assets/asset_list.html:79
#: assets/templates/assets/label_list.html:17
#: assets/templates/assets/system_user_list.html:31
#: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:61
#: ops/templates/ops/task_history.html:62 ops/templates/ops/task_list.html:41
#: perms/templates/perms/asset_permission_list.html:67
#: terminal/templates/terminal/session_list.html:79
#: terminal/templates/terminal/terminal_list.html:36
#: users/templates/users/user_group_list.html:15
#: users/templates/users/user_list.html:28
msgid "Action"
msgstr "动作"
#: assets/templates/assets/_asset_list_modal.html:34
#: assets/templates/assets/asset_list.html:88
#: users/templates/users/user_list.html:37
msgid "Delete selected"
msgstr "批量删除"
#: assets/templates/assets/_asset_list_modal.html:35
#: assets/templates/assets/asset_list.html:89
#: users/templates/users/user_list.html:38
msgid "Update selected"
msgstr "批量更新"
#: assets/templates/assets/_asset_list_modal.html:36
#: assets/templates/assets/asset_list.html:91
#: users/templates/users/user_list.html:39
msgid "Deactive selected"
msgstr "禁用所选"
#: assets/templates/assets/_asset_list_modal.html:37
#: assets/templates/assets/asset_list.html:92
#: users/templates/users/user_list.html:40
msgid "Active selected"
msgstr "激活所选"
#: assets/templates/assets/_asset_list_modal.html:41
#: assets/templates/assets/_system_user.html:71
#: assets/templates/assets/admin_user_create_update.html:46
#: assets/templates/assets/asset_bulk_update.html:24
#: assets/templates/assets/asset_create.html:65
#: assets/templates/assets/asset_list.html:96
#: assets/templates/assets/asset_update.html:69
#: assets/templates/assets/label_create_update.html:17
#: common/templates/common/basic_setting.html:59
#: common/templates/common/email_setting.html:60
#: common/templates/common/ldap_setting.html:60
#: common/templates/common/terminal_setting.html:83
#: perms/templates/perms/asset_permission_create_update.html:72
#: terminal/templates/terminal/terminal_update.html:47
#: users/templates/users/_user.html:44
#: users/templates/users/first_login.html:62
#: users/templates/users/forgot_password.html:44
#: users/templates/users/user_bulk_update.html:24
#: users/templates/users/user_list.html:44
#: users/templates/users/user_password_update.html:59
#: users/templates/users/user_profile_update.html:64
#: users/templates/users/user_pubkey_update.html:71
msgid "Submit"
msgstr "提交"
#: assets/templates/assets/_asset_list_modal.html:79
#: assets/templates/assets/admin_user_detail.html:24
#: assets/templates/assets/admin_user_list.html:83
#: assets/templates/assets/asset_detail.html:24
#: assets/templates/assets/asset_list.html:154
#: assets/templates/assets/label_list.html:38
#: assets/templates/assets/system_user_detail.html:26
#: assets/templates/assets/system_user_list.html:84
#: perms/templates/perms/asset_permission_detail.html:30
#: perms/templates/perms/asset_permission_list.html:115
#: terminal/templates/terminal/terminal_detail.html:16
#: terminal/templates/terminal/terminal_list.html:71
#: users/templates/users/user_detail.html:25
#: users/templates/users/user_group_detail.html:28
#: users/templates/users/user_group_list.html:43
#: users/templates/users/user_list.html:76
msgid "Update"
msgstr "更新"
#: assets/templates/assets/_asset_list_modal.html:80
#: assets/templates/assets/admin_user_detail.html:28
#: assets/templates/assets/admin_user_list.html:84
#: assets/templates/assets/asset_detail.html:28
#: assets/templates/assets/asset_list.html:155
#: assets/templates/assets/label_list.html:39
#: assets/templates/assets/system_user_detail.html:30
#: assets/templates/assets/system_user_list.html:85
#: ops/templates/ops/task_list.html:71
#: perms/templates/perms/asset_permission_detail.html:34
#: perms/templates/perms/asset_permission_list.html:116
#: terminal/templates/terminal/terminal_list.html:73
#: users/templates/users/user_detail.html:30
#: users/templates/users/user_group_detail.html:32
#: users/templates/users/user_group_list.html:45
#: users/templates/users/user_list.html:80
#: users/templates/users/user_list.html:84
msgid "Delete"
msgstr "删除"
#: assets/templates/assets/_system_user.html:16
#: assets/templates/assets/system_user_list.html:16
#: assets/views/system_user.py:45
......@@ -594,45 +656,42 @@ msgstr "创建系统用户"
#: assets/templates/assets/_system_user.html:37
#: assets/templates/assets/asset_create.html:16
#: assets/templates/assets/asset_update.html:21
#: assets/templates/assets/cluster_create_update.html:35
#: perms/templates/perms/asset_permission_create_update.html:38
msgid "Basic"
msgstr "基本"
#: assets/templates/assets/_system_user.html:45
#: assets/templates/assets/asset_create.html:24
#: assets/templates/assets/asset_update.html:29
#: assets/templates/assets/_system_user.html:44
#: assets/templates/assets/asset_create.html:23
#: assets/templates/assets/asset_update.html:28
#: assets/templates/assets/system_user_update.html:7
#: users/templates/users/user_create.html:9
#: users/templates/users/user_update.html:6
msgid "Auth"
msgstr "认证"
#: assets/templates/assets/_system_user.html:48
#: assets/templates/assets/_system_user.html:47
msgid "Auto generate key"
msgstr "自动生成秘钥"
#: assets/templates/assets/_system_user.html:65
#: assets/templates/assets/asset_create.html:58
#: assets/templates/assets/asset_update.html:62
#: assets/templates/assets/cluster_create_update.html:46
#: perms/templates/perms/asset_permission_create_update.html:45
#: assets/templates/assets/_system_user.html:64
#: assets/templates/assets/asset_create.html:57
#: assets/templates/assets/asset_update.html:61
#: perms/templates/perms/asset_permission_create_update.html:49
#: terminal/templates/terminal/terminal_update.html:41
msgid "Other"
msgstr "其它"
#: assets/templates/assets/_system_user.html:71
#: assets/templates/assets/_system_user.html:70
#: assets/templates/assets/admin_user_create_update.html:45
#: assets/templates/assets/asset_bulk_update.html:23
#: assets/templates/assets/asset_create.html:65
#: assets/templates/assets/asset_group_create.html:16
#: assets/templates/assets/asset_update.html:69
#: assets/templates/assets/cluster_create_update.html:54
#: assets/templates/assets/asset_create.html:64
#: assets/templates/assets/asset_update.html:68
#: assets/templates/assets/label_create_update.html:16
#: common/templates/common/basic_setting.html:58
#: common/templates/common/email_setting.html:59
#: common/templates/common/ldap_setting.html:59
#: common/templates/common/terminal_setting.html:82
#: perms/templates/perms/asset_permission_create_update.html:67
#: perms/templates/perms/asset_permission_create_update.html:71
#: terminal/templates/terminal/terminal_update.html:46
#: users/templates/users/_user.html:43
#: users/templates/users/user_bulk_update.html:23
......@@ -644,36 +703,8 @@ msgstr "其它"
msgid "Reset"
msgstr "重置"
#: assets/templates/assets/_system_user.html:72
#: assets/templates/assets/admin_user_create_update.html:46
#: assets/templates/assets/asset_bulk_update.html:24
#: assets/templates/assets/asset_create.html:66
#: assets/templates/assets/asset_group_create.html:17
#: assets/templates/assets/asset_list.html:61
#: assets/templates/assets/asset_update.html:70
#: assets/templates/assets/cluster_create_update.html:55
#: assets/templates/assets/label_create_update.html:17
#: common/templates/common/basic_setting.html:59
#: common/templates/common/email_setting.html:60
#: common/templates/common/ldap_setting.html:60
#: common/templates/common/terminal_setting.html:83
#: perms/templates/perms/asset_permission_create_update.html:68
#: terminal/templates/terminal/terminal_update.html:47
#: users/templates/users/_user.html:44
#: users/templates/users/first_login.html:62
#: users/templates/users/forgot_password.html:44
#: users/templates/users/user_bulk_update.html:24
#: users/templates/users/user_list.html:44
#: users/templates/users/user_password_update.html:59
#: users/templates/users/user_profile_update.html:64
#: users/templates/users/user_pubkey_update.html:71
msgid "Submit"
msgstr "提交"
#: assets/templates/assets/admin_user_assets.html:18
#: assets/templates/assets/admin_user_detail.html:18
#: assets/templates/assets/cluster_assets.html:20
#: assets/templates/assets/cluster_detail.html:17
#: assets/templates/assets/system_user_asset.html:17
#: assets/templates/assets/system_user_detail.html:18
#: ops/templates/ops/adhoc_history.html:129
......@@ -690,97 +721,31 @@ msgstr "详情"
msgid "Assets list"
msgstr "资产列表"
#: assets/templates/assets/admin_user_assets.html:24
#: assets/templates/assets/admin_user_detail.html:24
#: assets/templates/assets/admin_user_list.html:83
#: assets/templates/assets/asset_detail.html:24
#: assets/templates/assets/asset_group_detail.html:18
#: assets/templates/assets/asset_group_detail.html:176
#: assets/templates/assets/asset_group_list.html:42
#: assets/templates/assets/asset_list.html:106
#: assets/templates/assets/cluster_assets.html:169
#: assets/templates/assets/cluster_detail.html:25
#: assets/templates/assets/cluster_list.html:43
#: assets/templates/assets/label_list.html:38
#: assets/templates/assets/system_user_asset.html:25
#: assets/templates/assets/system_user_detail.html:26
#: assets/templates/assets/system_user_list.html:84
#: perms/templates/perms/asset_permission_detail.html:30
#: perms/templates/perms/asset_permission_list.html:78
#: terminal/templates/terminal/terminal_detail.html:16
#: terminal/templates/terminal/terminal_list.html:71
#: users/templates/users/user_detail.html:25
#: users/templates/users/user_group_detail.html:28
#: users/templates/users/user_group_list.html:43
#: users/templates/users/user_list.html:76
msgid "Update"
msgstr "更新"
#: assets/templates/assets/admin_user_assets.html:28
#: assets/templates/assets/admin_user_detail.html:28
#: assets/templates/assets/admin_user_list.html:84
#: assets/templates/assets/asset_detail.html:28
#: assets/templates/assets/asset_group_detail.html:22
#: assets/templates/assets/asset_group_list.html:43
#: assets/templates/assets/asset_list.html:107
#: assets/templates/assets/cluster_detail.html:29
#: assets/templates/assets/cluster_list.html:44
#: assets/templates/assets/label_list.html:39
#: assets/templates/assets/system_user_detail.html:30
#: assets/templates/assets/system_user_list.html:85
#: ops/templates/ops/task_list.html:71
#: perms/templates/perms/asset_permission_detail.html:34
#: perms/templates/perms/asset_permission_list.html:79
#: terminal/templates/terminal/terminal_list.html:73
#: users/templates/users/user_detail.html:30
#: users/templates/users/user_group_detail.html:32
#: users/templates/users/user_group_list.html:45
#: users/templates/users/user_list.html:80
#: users/templates/users/user_list.html:84
msgid "Delete"
msgstr "删除"
#: assets/templates/assets/admin_user_assets.html:37
#: assets/templates/assets/asset_group_detail.html:31
#: assets/templates/assets/admin_user_assets.html:29
#: perms/templates/perms/asset_permission_asset.html:35
msgid "Asset list of "
msgstr "资产列表"
#: assets/templates/assets/admin_user_assets.html:62
#: common/templates/common/terminal_setting.html:63
#: users/templates/users/login_log_list.html:50
msgid "Type"
msgstr "类型"
#: assets/templates/assets/admin_user_assets.html:63
#: assets/templates/assets/admin_user_list.html:25
#: assets/templates/assets/asset_detail.html:365
#: assets/templates/assets/asset_list.html:44
#: assets/templates/assets/system_user_asset.html:55
#: assets/templates/assets/system_user_list.html:27
msgid "Reachable"
msgstr "可连接"
#: assets/templates/assets/admin_user_assets.html:75
#: assets/templates/assets/cluster_assets.html:67
#: assets/templates/assets/system_user_asset.html:67
#: assets/templates/assets/admin_user_assets.html:66
#: assets/templates/assets/system_user_asset.html:64
#: assets/templates/assets/system_user_detail.html:112
#: perms/templates/perms/asset_permission_detail.html:110
msgid "Quick update"
msgstr "快速更新"
#: assets/templates/assets/admin_user_assets.html:81
#: assets/templates/assets/asset_detail.html:175
#: assets/templates/assets/admin_user_assets.html:72
#: assets/templates/assets/asset_detail.html:167
msgid "Test connective"
msgstr "测试可连接性"
#: assets/templates/assets/admin_user_assets.html:84
#: assets/templates/assets/asset_detail.html:178
#: assets/templates/assets/system_user_asset.html:84
#: assets/templates/assets/admin_user_assets.html:75
#: assets/templates/assets/asset_detail.html:170
#: assets/templates/assets/system_user_asset.html:81
#: assets/templates/assets/system_user_detail.html:145
msgid "Test"
msgstr "测试"
#: assets/templates/assets/admin_user_assets.html:147
#: assets/templates/assets/admin_user_assets.html:131
msgid "Task has been send, seen left asset status"
msgstr "任务已下发，查看左侧资产状态"
......@@ -790,17 +755,14 @@ msgstr "任务已下发，查看左侧资产状态"
msgid "Create admin user"
msgstr "创建管理用户"
#: assets/templates/assets/admin_user_detail.html:84
msgid "Using this as cluster admin user"
msgstr "使用集群管理用户"
#: assets/templates/assets/admin_user_detail.html:83
msgid "Replace assets admin user with this"
msgstr "替换资产管理员"
#: assets/templates/assets/admin_user_detail.html:101
#: assets/templates/assets/asset_detail.html:206
#: assets/templates/assets/asset_group_list.html:85
#: assets/templates/assets/asset_list.html:242
#: assets/templates/assets/cluster_assets.html:103
#: assets/templates/assets/cluster_list.html:89
#: assets/templates/assets/system_user_detail.html:164
#: assets/templates/assets/admin_user_detail.html:100
#: assets/templates/assets/asset_detail.html:198
#: assets/templates/assets/asset_list.html:461
#: assets/templates/assets/system_user_detail.html:181
#: assets/templates/assets/system_user_list.html:134 templates/_modal.html:16
#: terminal/templates/terminal/session_detail.html:108
#: users/templates/users/user_detail.html:339
......@@ -818,290 +780,141 @@ msgstr "确认"
msgid "Unreachable"
msgstr "不可达"
#: assets/templates/assets/admin_user_list.html:27
#: assets/templates/assets/system_user_list.html:29
#: ops/templates/ops/adhoc_history.html:54
#: ops/templates/ops/task_history.html:57
msgid "Ratio"
msgstr "比例"
#: assets/templates/assets/admin_user_list.html:29
#: assets/templates/assets/asset_group_detail.html:54
#: assets/templates/assets/asset_group_list.html:18
#: assets/templates/assets/asset_list.html:45
#: assets/templates/assets/cluster_assets.html:55
#: assets/templates/assets/cluster_list.html:23
#: assets/templates/assets/label_list.html:17
#: assets/templates/assets/system_user_list.html:31
#: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:61
#: ops/templates/ops/task_history.html:62 ops/templates/ops/task_list.html:41
#: perms/templates/perms/asset_permission_list.html:32
#: terminal/templates/terminal/session_list.html:79
#: terminal/templates/terminal/terminal_list.html:36
#: users/templates/users/user_group_list.html:15
#: users/templates/users/user_list.html:28
msgid "Action"
msgstr "动作"
#: assets/templates/assets/admin_user_list.html:27
#: assets/templates/assets/system_user_list.html:29
#: ops/templates/ops/adhoc_history.html:54
#: ops/templates/ops/task_history.html:57
msgid "Ratio"
msgstr "比例"
#: assets/templates/assets/asset_create.html:28
#: assets/templates/assets/asset_update.html:33
msgid "Group"
msgstr "组"
#: assets/templates/assets/asset_create.html:27
#: assets/templates/assets/asset_update.html:32 perms/models.py:74
#: perms/templates/perms/asset_permission_create_update.html:40
#: perms/templates/perms/asset_permission_list.html:62
msgid "Node"
msgstr "节点"
#: assets/templates/assets/asset_create.html:34
#: assets/templates/assets/asset_list.html:27
#: assets/templates/assets/asset_update.html:39
#: assets/templates/assets/asset_create.html:33
#: assets/templates/assets/asset_list.html:63
#: assets/templates/assets/asset_update.html:38
msgid "Label"
msgstr "标签"
#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:188
#: assets/views/cluster.py:98
#: assets/templates/assets/asset_create.html:35
msgid "Select labels"
msgstr "选择标签"
#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:196
msgid "Asset detail"
msgstr "资产详情"
#: assets/templates/assets/asset_detail.html:93
#: assets/templates/assets/asset_detail.html:85
msgid "CPU"
msgstr "CPU"
#: assets/templates/assets/asset_detail.html:101
#: assets/templates/assets/asset_detail.html:93
msgid "Disk"
msgstr "硬盘"
#: assets/templates/assets/asset_detail.html:129
#: assets/templates/assets/asset_detail.html:121
#: users/templates/users/user_detail.html:103
#: users/templates/users/user_profile.html:88
msgid "Date joined"
msgstr "创建日期"
#: assets/templates/assets/asset_detail.html:145
#: assets/templates/assets/asset_detail.html:137
#: terminal/templates/terminal/session_detail.html:81
#: users/templates/users/user_detail.html:122
#: users/templates/users/user_profile.html:130
msgid "Quick modify"
msgstr "快速修改"
#: assets/templates/assets/asset_detail.html:151
#: assets/templates/assets/asset_list.html:43
#: assets/templates/assets/user_asset_list.html:23 perms/models.py:20
#: perms/templates/perms/asset_permission_create_update.html:47
#: perms/templates/perms/asset_permission_detail.html:116
#: terminal/templates/terminal/terminal_list.html:34
#: users/templates/users/_select_user_modal.html:18
#: users/templates/users/user_detail.html:128
#: users/templates/users/user_list.html:27
#: users/templates/users/user_profile.html:63
msgid "Active"
msgstr "激活中"
#: assets/templates/assets/asset_detail.html:167
#: assets/templates/assets/asset_detail.html:159
msgid "Refresh hardware"
msgstr "更新硬件信息"
#: assets/templates/assets/asset_detail.html:170
#: assets/templates/assets/asset_detail.html:162
msgid "Refresh"
msgstr "刷新"
#: assets/templates/assets/asset_detail.html:197
msgid "Join asset groups"
msgstr "添加到资产组"
#: assets/templates/assets/asset_detail.html:307
#: assets/templates/assets/asset_detail.html:299
#: users/templates/users/user_detail.html:273
msgid "Update successfully!"
msgstr "更新成功"
#: assets/templates/assets/asset_group_detail.html:16
msgid "Group assets"
msgstr "组下资产"
#: assets/templates/assets/asset_group_detail.html:53
#: assets/templates/assets/cluster_assets.html:54
#: terminal/templates/terminal/terminal_list.html:35
msgid "Alive"
msgstr "在线"
#: assets/templates/assets/asset_group_detail.html:66
msgid "Add assets to this group"
msgstr "添加资产到该组"
#: assets/templates/assets/asset_group_detail.html:83
#: perms/templates/perms/asset_permission_asset.html:97
#: perms/templates/perms/asset_permission_detail.html:153
#: perms/templates/perms/asset_permission_user.html:97
#: perms/templates/perms/asset_permission_user.html:125
#: users/templates/users/user_group_detail.html:95
msgid "Add"
msgstr "添加"
#: assets/templates/assets/asset_group_detail.html:177
msgid "Remove"
msgstr "移除"
#: assets/templates/assets/asset_group_list.html:7 assets/views/group.py:35
#: assets/views/group.py:88
msgid "Create asset group"
msgstr "创建资产组"
#: assets/templates/assets/asset_group_list.html:80
#: assets/templates/assets/asset_list.html:237
#: assets/templates/assets/cluster_list.html:84
#: assets/templates/assets/system_user_list.html:129
#: users/templates/users/user_detail.html:334
#: users/templates/users/user_detail.html:359
#: users/templates/users/user_group_list.html:81
#: users/templates/users/user_list.html:191
msgid "Are you sure?"
msgstr "你确认吗?"
#: assets/templates/assets/asset_group_list.html:81
#: users/templates/users/user_group_list.html:82
msgid "This will delete the selected groups !!!"
msgstr "删除选择组"
#: assets/templates/assets/asset_group_list.html:89
msgid "Group deleted"
msgstr "组已被删除"
#: assets/templates/assets/asset_group_list.html:90
#: assets/templates/assets/asset_group_list.html:95
msgid "Group Delete"
msgstr "删除"
#: assets/templates/assets/asset_group_list.html:94
msgid "Group deleting failed."
msgstr "删除失败"
#: assets/templates/assets/asset_group_list.html:157
msgid "The selected asset groups has been updated successfully."
msgstr "更新成功"
#: assets/templates/assets/asset_group_list.html:158
msgid "AssetGroup Updated"
msgstr "资产组更新"
#: assets/templates/assets/asset_list.html:51
#: assets/templates/assets/asset_list.html:108 assets/views/asset.py:95
msgid "Create asset"
msgstr "创建资产"
#: assets/templates/assets/asset_list.html:15
#: assets/templates/assets/asset_list.html:55
#: users/templates/users/user_list.html:7
msgid "Import"
msgstr "导入"
#: assets/templates/assets/asset_list.html:18
#: assets/templates/assets/asset_list.html:58
#: users/templates/users/user_list.html:10
msgid "Export"
msgstr "导出"
#: assets/templates/assets/asset_list.html:25 assets/views/asset.py:87
msgid "Create asset"
msgstr "创建资产"
#: assets/templates/assets/asset_list.html:90
msgid "Remove from this node"
msgstr "从节点移除"
#: assets/templates/assets/asset_list.html:42
#: assets/templates/assets/user_asset_list.html:22
msgid "Hardware"
msgstr "硬件"
#: assets/templates/assets/asset_list.html:109
msgid "Add asset"
msgstr "添加资产到节点"
#: assets/templates/assets/asset_list.html:54
#: users/templates/users/user_list.html:37
msgid "Delete selected"
msgstr "批量删除"
#: assets/templates/assets/asset_list.html:111
msgid "Add node"
msgstr "新建节点"
#: assets/templates/assets/asset_list.html:55
#: users/templates/users/user_list.html:38
msgid "Update selected"
msgstr "批量更新"
#: assets/templates/assets/asset_list.html:112
msgid "Rename node"
msgstr "重命名节点"
#: assets/templates/assets/asset_list.html:56
#: users/templates/users/user_list.html:39
msgid "Deactive selected"
msgstr "禁用所选"
#: assets/templates/assets/asset_list.html:114
msgid "Delete node"
msgstr "删除节点"
#: assets/templates/assets/asset_list.html:57
#: users/templates/users/user_list.html:40
msgid "Active selected"
msgstr "激活所选"
#: assets/templates/assets/asset_list.html:189
msgid "Create node failed"
msgstr "创建节点失败"
#: assets/templates/assets/asset_list.html:202
msgid "Have child node, cancel"
msgstr "存在子节点，不能删除"
#: assets/templates/assets/asset_list.html:456
#: assets/templates/assets/system_user_list.html:129
#: users/templates/users/user_detail.html:334
#: users/templates/users/user_detail.html:359
#: users/templates/users/user_group_list.html:81
#: users/templates/users/user_list.html:191
msgid "Are you sure?"
msgstr "你确认吗?"
#: assets/templates/assets/asset_list.html:238
#: assets/templates/assets/asset_list.html:457
msgid "This will delete the selected assets !!!"
msgstr "删除选择资产"
# msgid "Deleted!"
# msgstr "删除"
#: assets/templates/assets/asset_list.html:246
#: assets/templates/assets/asset_list.html:465
msgid "Asset Deleted."
msgstr "已被删除"
#: assets/templates/assets/asset_list.html:247
#: assets/templates/assets/asset_list.html:252
#: assets/templates/assets/asset_list.html:466
#: assets/templates/assets/asset_list.html:471
msgid "Asset Delete"
msgstr "删除"
#: assets/templates/assets/asset_list.html:251
#: assets/templates/assets/asset_list.html:470
msgid "Asset Deleting failed."
msgstr "删除失败"
#: assets/templates/assets/asset_update.html:58
#: assets/templates/assets/asset_update.html:57
msgid "Configuration"
msgstr "配置"
#: assets/templates/assets/cluster_assets.html:23
#: assets/templates/assets/cluster_assets.html:31
#: assets/templates/assets/cluster_detail.html:21
msgid "Cluster assets"
msgstr "集群中资产"
#: assets/templates/assets/cluster_assets.html:73
#: assets/templates/assets/system_user_asset.html:81
msgid "Test assets connective"
msgstr "测试资产可连接性"
#: assets/templates/assets/cluster_assets.html:76
#: ops/templates/ops/task_list.html:70
msgid "Run"
msgstr "执行"
#: assets/templates/assets/cluster_assets.html:86
msgid "Add assets to"
msgstr "添加资产到"
#: assets/templates/assets/cluster_assets.html:94
msgid "Select asset"
msgstr "选择资产"
#: assets/templates/assets/cluster_assets.html:211
#: assets/templates/assets/system_user_asset.html:162
msgid "Task has been send, seen left assets status"
msgstr "任务已下发，查看左侧资产状态"
#: assets/templates/assets/cluster_create_update.html:41
#: users/templates/users/reset_password.html:57
#: users/templates/users/user_profile.html:20
msgid "Setting"
msgstr "设置"
#: assets/templates/assets/cluster_list.html:11 assets/views/cluster.py:43
msgid "Create cluster"
msgstr "创建集群"
#: assets/templates/assets/cluster_list.html:21
#: users/templates/users/_select_user_modal.html:17
msgid "Asset num"
msgstr "资产数量"
#: assets/templates/assets/cluster_list.html:85
msgid "This will delete the selected cluster"
msgstr "删除选择Cluster"
#: assets/templates/assets/cluster_list.html:93
msgid "Cluster Deleted."
msgstr "集群已被删除"
#: assets/templates/assets/cluster_list.html:94
#: assets/templates/assets/cluster_list.html:99
msgid "Cluster delete"
msgstr "删除集群"
#: assets/templates/assets/cluster_list.html:98
msgid "Cluster deleting failed."
msgstr "Cluster删除失败"
#: assets/templates/assets/delete_confirm.html:6
#: perms/templates/perms/delete_confirm.html:6 templates/delete_confirm.html:6
msgid "Confirm delete"
......@@ -1116,25 +929,32 @@ msgstr "您确定删除吗?"
msgid "Create label"
msgstr "创建标签"
#: assets/templates/assets/system_user_asset.html:33
#: assets/templates/assets/system_user_asset.html:30
msgid "Assets of "
msgstr "资产"
#: assets/templates/assets/system_user_asset.html:73
#: assets/templates/assets/system_user_asset.html:70
#: assets/templates/assets/system_user_detail.html:134
msgid "Push system user manually"
msgstr "手动推送系统"
#: assets/templates/assets/system_user_asset.html:76
#: assets/templates/assets/system_user_asset.html:73
#: assets/templates/assets/system_user_detail.html:137
msgid "Push"
msgstr "推送"
#: assets/templates/assets/system_user_asset.html:150
#: assets/templates/assets/system_user_asset.html:78
#: assets/templates/assets/system_user_detail.html:142
msgid "Test assets connective"
msgstr "测试资产可连接性"
#: assets/templates/assets/system_user_asset.html:147
msgid "Task has been send, Go to ops task list seen result"
msgstr "任务已下发，查看ops任务列表"
#: assets/templates/assets/system_user_detail.html:22
msgid "Attached assets"
msgstr "关联的资产"
#: assets/templates/assets/system_user_asset.html:159
msgid "Task has been send, seen left assets status"
msgstr "任务已下发，查看左侧资产状态"
#: assets/templates/assets/system_user_detail.html:81
msgid "Home"
......@@ -1144,13 +964,9 @@ msgstr "家目录"
msgid "Uid"
msgstr "Uid"
#: assets/templates/assets/system_user_detail.html:147
msgid "Clusters"
msgstr "集群"
#: assets/templates/assets/system_user_detail.html:155
msgid "Add to cluster"
msgstr "添加到集群"
#: assets/templates/assets/system_user_detail.html:172
msgid "Add to node"
msgstr "添加到节点"
#: assets/templates/assets/system_user_list.html:130
msgid "This will delete the selected System Users !!!"
......@@ -1181,51 +997,30 @@ msgstr "管理用户列表"
msgid "Update admin user"
msgstr "更新管理用户"
#: assets/views/admin_user.py:80 assets/views/admin_user.py:107
#: assets/views/admin_user.py:79 assets/views/admin_user.py:103
msgid "Admin user detail"
msgstr "管理用户详情"
#: assets/views/asset.py:49 assets/views/asset.py:63
#: assets/views/asset.py:48 assets/views/asset.py:61 templates/_nav.html:22
msgid "Asset list"
msgstr "资产列表"
#: assets/views/asset.py:147
#: assets/views/asset.py:155
msgid "Bulk update asset"
msgstr "批量更新资产"
#: assets/views/asset.py:164
#: assets/views/asset.py:172
msgid "Update asset"
msgstr "编辑资产"
#: assets/views/asset.py:300
#: assets/views/asset.py:225 assets/views/asset.py:265
msgid "Asset groups"
msgstr "资产组"
#: assets/views/asset.py:305
msgid "already exists"
msgstr "已经存在"
#: assets/views/cluster.py:27
msgid "Cluster list"
msgstr "集群列表"
#: assets/views/cluster.py:42 assets/views/cluster.py:65
#: assets/views/system_user.py:96
msgid "assets"
msgstr "资产管理"
#: assets/views/cluster.py:66
msgid "Update Cluster"
msgstr "更新Cluster"
#: assets/views/cluster.py:81
msgid "Cluster detail"
msgstr "集群详情"
#: assets/views/group.py:53
msgid "Asset group list"
msgstr "资产组列表"
#: assets/views/group.py:70
msgid "Asset group detail"
msgstr "资产组详情"
#: assets/views/label.py:27
msgid "Label list"
msgstr "标签列表"
......@@ -1242,11 +1037,15 @@ msgstr "系统用户列表"
msgid "Update system user"
msgstr "更新系统用户"
#: assets/views/system_user.py:76
#: assets/views/system_user.py:75
msgid "System user detail"
msgstr "系统用户详情"
#: assets/views/system_user.py:97
#: assets/views/system_user.py:95
msgid "assets"
msgstr "资产管理"
#: assets/views/system_user.py:96
msgid "System user asset"
msgstr "系统用户集群资产"
......@@ -1272,11 +1071,11 @@ msgstr "<b>%(name)s</b> 创建成功"
msgid "<b>%(name)s</b> was updated successfully"
msgstr "<b>%(name)s</b> 更新成功"
#: common/fields.py:25
#: common/fields.py:26
msgid "Not a valid json"
msgstr "不是合法json"
#: common/fields.py:27
#: common/fields.py:28
msgid "Not a string type"
msgstr "不是字符类型"
......@@ -1446,8 +1245,13 @@ msgstr "终端设置"
msgid "Test connection"
msgstr "测试连接"
#: common/templates/common/terminal_setting.html:63
#: users/templates/users/login_log_list.html:50
msgid "Type"
msgstr "类型"
#: common/views.py:20 common/views.py:46 common/views.py:72 common/views.py:101
#: templates/_nav.html:68
#: templates/_nav.html:66
msgid "Settings"
msgstr "系统设置"
......@@ -1701,6 +1505,10 @@ msgstr "成功"
msgid "Date"
msgstr "日期"
#: ops/templates/ops/task_list.html:70
msgid "Run"
msgstr "执行"
#: ops/templates/ops/task_list.html:125
msgid "Task start: "
msgstr "任务开始: "
......@@ -1710,7 +1518,7 @@ msgstr "任务开始: "
msgid "Ops"
msgstr "作业中心"
#: ops/views.py:37
#: ops/views.py:37 templates/_nav.html:52
msgid "Task list"
msgstr "任务列表"
......@@ -1718,46 +1526,26 @@ msgstr "任务列表"
msgid "Task run history"
msgstr "执行历史"
#: perms/forms.py:16 users/forms.py:147 users/forms.py:152 users/forms.py:164
#: users/forms.py:194
msgid "Select users"
msgstr "选择用户"
#: perms/forms.py:31 perms/templates/perms/asset_permission_user.html:116
msgid "Select user groups"
msgstr "选择用户组"
#: perms/forms.py:52
msgid "User or group at least one required"
msgstr "用户和组至少需要选一个"
#: perms/forms.py:60
msgid "Asset or group at least one required"
msgstr "资产或组至少需要选择一个"
#: perms/forms.py:78
msgid "Asset {} of cluster {} not have [{}] system users, please check \n"
msgstr "资产 {} 所在集群 {} 不包含系统用户 [{}] 请检查\n"
#: perms/forms.py:87
msgid ""
"Asset {}(group {}) of cluster {} not have [{}] system users, please check \n"
msgstr "资产 {}(组 {}) 所在集群 {} 不包含系统用户 [{}] 请检查\n"
#: perms/models.py:16 perms/templates/perms/asset_permission_list.html:27
#: templates/_nav.html:13 users/models/user.py:37
#: users/templates/users/_select_user_modal.html:16
#: perms/forms.py:22 perms/models.py:16 perms/models.py:75
#: perms/templates/perms/asset_permission_list.html:63 templates/_nav.html:13
#: users/models/user.py:37 users/templates/users/_select_user_modal.html:16
#: users/templates/users/user_detail.html:179
#: users/templates/users/user_list.html:26
msgid "User group"
msgstr "用户组"
#: perms/models.py:21 perms/templates/perms/asset_permission_detail.html:86
#: users/models/user.py:49 users/templates/users/user_detail.html:95
#: perms/models.py:21 perms/models.py:78
#: perms/templates/perms/asset_permission_detail.html:86
#: perms/templates/perms/asset_permission_list.html:66 users/models/user.py:49
#: users/templates/users/user_detail.html:95
#: users/templates/users/user_profile.html:96
msgid "Date expired"
msgstr "失效日期"
#: perms/models.py:88 templates/_nav.html:32
msgid "Asset permission"
msgstr "资产授权"
#: perms/templates/perms/asset_permission_asset.html:22
#: perms/templates/perms/asset_permission_detail.html:22
#: perms/templates/perms/asset_permission_user.html:22
......@@ -1774,10 +1562,22 @@ msgstr "资产或资产组"
msgid "Add asset to this permission"
msgstr "添加资产"
#: perms/templates/perms/asset_permission_asset.html:97
#: perms/templates/perms/asset_permission_detail.html:153
#: perms/templates/perms/asset_permission_user.html:97
#: perms/templates/perms/asset_permission_user.html:125
#: users/templates/users/user_group_detail.html:95
msgid "Add"
msgstr "添加"
#: perms/templates/perms/asset_permission_asset.html:108
msgid "Add asset group to this permission"
msgstr "添加资产组"
#: perms/templates/perms/asset_permission_asset.html:116 users/forms.py:245
msgid "Select asset groups"
msgstr "选择资产组"
#: perms/templates/perms/asset_permission_asset.html:125
#: users/templates/users/user_detail.html:196
msgid "Join"
......@@ -1807,14 +1607,14 @@ msgstr "资产组数量"
msgid "System user count"
msgstr "系统用户数量"
#: perms/templates/perms/asset_permission_list.html:16
#: perms/templates/perms/asset_permission_detail.html:144 users/forms.py:248
msgid "Select system users"
msgstr "选择系统用户"
#: perms/templates/perms/asset_permission_list.html:53
msgid "Create permission"
msgstr "创建授权规则"
#: perms/templates/perms/asset_permission_list.html:31
msgid "Is valid"
msgstr "有效"
#: perms/templates/perms/asset_permission_user.html:35
msgid "User list of "
msgstr "用户列表"
......@@ -1832,35 +1632,26 @@ msgstr "选择用户"
msgid "Add user group to asset permission"
msgstr "添加用户组"
#: perms/views.py:28 perms/views.py:44 perms/views.py:60 perms/views.py:74
#: perms/views.py:111 perms/views.py:141 templates/_nav.html:31
#: perms/templates/perms/asset_permission_user.html:116
msgid "Select user groups"
msgstr "选择用户组"
#: perms/views.py:23 perms/views.py:47 perms/views.py:67 templates/_nav.html:29
msgid "Perms"
msgstr "权限管理"
#: perms/views.py:29
#: perms/views.py:24
msgid "Asset permission list"
msgstr "资产授权列表"
#: perms/views.py:45
#: perms/views.py:48
msgid "Create asset permission"
msgstr "创建权限规则"
#: perms/views.py:61
#: perms/views.py:68
msgid "Update asset permission"
msgstr "更新资产授权"
#: perms/views.py:75
msgid "Asset permission detail"
msgstr "资产授权详情"
#: perms/views.py:112
msgid "Asset permission user list"
msgstr "资产授权包含用户"
#: perms/views.py:142
msgid "Asset permission asset list"
msgstr "资产组授权包含资产"
#: templates/_header_bar.html:18
msgid "Help"
msgstr "帮助"
......@@ -1871,7 +1662,7 @@ msgstr "帮助"
#: users/templates/users/user_profile.html:17
#: users/templates/users/user_profile_update.html:37
#: users/templates/users/user_profile_update.html:57
#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:319
#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:315
msgid "Profile"
msgstr "个人信息"
......@@ -1929,36 +1720,36 @@ msgstr "关闭"
#: templates/_nav.html:9 users/views/group.py:28 users/views/group.py:44
#: users/views/group.py:62 users/views/group.py:79 users/views/login.py:200
#: users/views/login.py:249 users/views/user.py:57 users/views/user.py:72
#: users/views/user.py:91 users/views/user.py:147 users/views/user.py:304
#: users/views/user.py:318 users/views/user.py:355 users/views/user.py:377
#: users/views/user.py:91 users/views/user.py:147 users/views/user.py:300
#: users/views/user.py:314 users/views/user.py:351 users/views/user.py:373
msgid "Users"
msgstr "用户管理"
#: templates/_nav.html:12 users/views/user.py:58
msgid "User list"
msgstr "用户列表"
#: templates/_nav.html:14
msgid "Login logs"
msgstr "登录日志"
#: templates/_nav.html:34
msgid "Asset permission"
msgstr "资产授权"
#: templates/_nav.html:40
#: templates/_nav.html:38
msgid "Sessions"
msgstr "会话管理"
#: templates/_nav.html:43
#: templates/_nav.html:41
msgid "Session online"
msgstr "在线会话"
#: templates/_nav.html:44
#: templates/_nav.html:42
msgid "Session offline"
msgstr "历史会话"
#: templates/_nav.html:45
#: templates/_nav.html:43
msgid "Commands"
msgstr "命令记录"
#: templates/_nav.html:46 terminal/templates/terminal/session_list.html:75
#: templates/_nav.html:44 terminal/templates/terminal/session_list.html:75
#: terminal/views/command.py:47 terminal/views/session.py:75
#: terminal/views/session.py:92 terminal/views/session.py:114
#: terminal/views/terminal.py:31 terminal/views/terminal.py:46
......@@ -1966,14 +1757,10 @@ msgstr "命令记录"
msgid "Terminal"
msgstr "终端管理"
#: templates/_nav.html:51
#: templates/_nav.html:49
msgid "Job Center"
msgstr "作业中心"
#: templates/_nav.html:54
msgid "Task"
msgstr "任务"
#: templates/_nav_user.html:4
msgid "My assets"
msgstr "我的资产"
......@@ -2150,6 +1937,10 @@ msgstr "HTTP端口"
msgid "Addr"
msgstr "地址"
#: terminal/templates/terminal/terminal_list.html:35
msgid "Alive"
msgstr "在线"
#: terminal/templates/terminal/terminal_list.html:76
msgid "Accept"
msgstr "接受"
......@@ -2290,6 +2081,10 @@ msgstr "不能和原来的密钥相同"
msgid "Not a valid ssh public key"
msgstr "ssh密钥不合法"
#: users/forms.py:147 users/forms.py:152 users/forms.py:164 users/forms.py:194
msgid "Select users"
msgstr "选择用户"
#: users/models/authentication.py:35
msgid "Private Token"
msgstr "ssh密钥"
......@@ -2314,7 +2109,7 @@ msgstr "Agent"
msgid "Date login"
msgstr "登录日期"
#: users/models/user.py:29 users/models/user.py:254
#: users/models/user.py:29 users/models/user.py:257
msgid "Administrator"
msgstr "管理员"
......@@ -2353,7 +2148,7 @@ msgstr "二次验证"
msgid "Public key"
msgstr "ssh公钥"
#: users/models/user.py:257
#: users/models/user.py:260
msgid "Administrator is the super user of system"
msgstr "Administrator是初始的超级管理员"
......@@ -2361,6 +2156,10 @@ msgstr "Administrator是初始的超级管理员"
msgid "Please Select User"
msgstr "选择用户"
#: users/templates/users/_select_user_modal.html:17
msgid "Asset num"
msgstr "资产数量"
#: users/templates/users/_user.html:13
#: users/templates/users/user_profile_update.html:51
msgid "Account"
......@@ -2450,6 +2249,11 @@ msgstr "重置密码"
msgid "Password again"
msgstr "再次输入密码"
#: users/templates/users/reset_password.html:57
#: users/templates/users/user_profile.html:20
msgid "Setting"
msgstr "设置"
#: users/templates/users/user_create.html:4
#: users/templates/users/user_list.html:16 users/views/user.py:72
msgid "Create user"
......@@ -2460,14 +2264,13 @@ msgid "Reset link will be generated and sent to the user. "
msgstr "生成重置密码连接，通过邮件发送给用户"
#: users/templates/users/user_detail.html:19
#: users/templates/users/user_granted_asset.html:18
#: users/templates/users/user_group_granted_asset.html:18
#: users/views/user.py:148
#: users/templates/users/user_granted_asset.html:18 users/views/user.py:148
msgid "User detail"
msgstr "用户详情"
#: users/templates/users/user_detail.html:22
#: users/templates/users/user_granted_asset.html:21
#: users/templates/users/user_group_detail.html:25
#: users/templates/users/user_group_granted_asset.html:21
msgid "Asset granted"
msgstr "授权的资产"
......@@ -2525,21 +2328,13 @@ msgstr "更新ssh密钥成功"
msgid "User SSH public key update"
msgstr "ssh密钥"
#: users/templates/users/user_granted_asset.html:29
#: users/templates/users/user_group_granted_asset.html:29
msgid "Assets granted of "
msgstr "授权资产"
#: users/templates/users/user_granted_asset.html:62
#: users/templates/users/user_group_granted_asset.html:65
msgid "Asset groups granted of "
msgstr "授权资产组"
#: users/templates/users/user_group_create_update.html:31
msgid "Cancel"
msgstr "取消"
#: users/templates/users/user_group_detail.html:22 users/views/group.py:80
#: users/templates/users/user_group_detail.html:22
#: users/templates/users/user_group_granted_asset.html:18
#: users/views/group.py:80
msgid "User group detail"
msgstr "资产组详情"
......@@ -2547,14 +2342,14 @@ msgstr "资产组详情"
msgid "Add user"
msgstr "添加用户"
#: users/templates/users/user_group_granted_asset.html:53
msgid "Valid"
msgstr "可用"
#: users/templates/users/user_group_list.html:5 users/views/group.py:45
msgid "Create user group"
msgstr "创建用户组"
#: users/templates/users/user_group_list.html:82
msgid "This will delete the selected groups !!!"
msgstr "删除选择组"
#: users/templates/users/user_group_list.html:90
msgid "UserGroups Deleted."
msgstr "用户组删除"
......@@ -2805,10 +2600,6 @@ msgstr "首次登陆"
msgid "Login log list"
msgstr "登录日志"
#: users/views/user.py:58
msgid "User list"
msgstr "用户列表"
#: users/views/user.py:101
msgid "Bulk update user success"
msgstr "批量更新用户成功"
......@@ -2817,101 +2608,19 @@ msgstr "批量更新用户成功"
msgid "Invalid file."
msgstr "文件不合法"
#: users/views/user.py:305
#: users/views/user.py:301
msgid "User granted assets"
msgstr "用户授权资产"
#: users/views/user.py:338
#: users/views/user.py:334
msgid "Profile setting"
msgstr "个人信息设置"
#: users/views/user.py:356
#: users/views/user.py:352
msgid "Password update"
msgstr "密码更新"
#: users/views/user.py:378
#: users/views/user.py:374
msgid "Public key update"
msgstr "秘钥更新"
#, fuzzy
#~| msgid "Select labels"
#~ msgid "Select lables"
#~ msgstr "选择标签"
#~ msgid "Auth info required, private_key or password"
#~ msgstr "密钥和密码必须填写一个"
#~ msgid "In use"
#~ msgstr "使用中"
#~ msgid "Out of use"
#~ msgstr "未使用"
#~ msgid "Server"
#~ msgstr "物理机"
#~ msgid "VM"
#~ msgstr "虚拟机"
#~ msgid "Switch"
#~ msgstr "交换机"
#~ msgid "Router"
#~ msgstr "路由器"
#~ msgid "Firewall"
#~ msgstr "防火墙"
#~ msgid "Storage"
#~ msgstr "存储"
#~ msgid "Production"
#~ msgstr "生产环境"
#~ msgid "Development"
#~ msgstr "开发环境"
#~ msgid "Testing"
#~ msgstr "测试环境"
#~ msgid "Asset type"
#~ msgstr "系统类型"
#~ msgid "Asset environment"
#~ msgstr "资产环境"
#~ msgid "Asset status"
#~ msgstr "资产状态"
#~ msgid "Remote control card IP"
#~ msgstr "远控卡IP"
#~ msgid "Cabinet number"
#~ msgstr "机柜编号"
#~ msgid "Cabinet position"
#~ msgstr "机柜层号"
#~ msgid "Remote card IP"
#~ msgstr "远控卡IP"
#~ msgid "Location"
#~ msgstr "位置"
#~ msgid "Env"
#~ msgstr "环境"
#~ msgid "Default using cluster admin user"
#~ msgstr "默认使用管理用户"
#~ msgid "Add command storage"
#~ msgstr "添加命令存储"
#~ msgid "Welcome to use Jumpserver system"
#~ msgstr "欢迎使用Jumpserver开源跳板机系统"
#~ msgid "This will reset the user\\"
#~ msgstr "重置"
#~ msgid "Connect"
#~ msgstr "连接"
apps/perms/templates/perms/asset_permission_list.html
View file @ 08edda35
......@@ -112,13 +112,13 @@ function initTable() {
}
}},
{targets: 6, createdCell: function (td, cellData, rowData) {
var name = rowData.user_group.name + "=>" + rowData.system_user.name + "=>" + rowData.node.name;
var update_btn = '<a href="{% url "perms:asset-permission-update" pk=DEFAULT_PK %}" class="btn btn-xs m-l-xs btn-info">{% trans "Update" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn-del" data-uid="{{ DEFAULT_PK }}" data-name="99991938">{% trans "Delete" %}</a>'
.replace('{{ DEFAULT_PK }}', cellData)
.replace('99991938', rowData.name);
.replace('99991938', name);
$(td).html(update_btn + del_btn);
}}
],
ajax_url: '{% url "api-perms:asset-permission-list" %}',
columns: [
......@@ -207,8 +207,8 @@ $(document).ready(function(){
})
.on('click', '.btn-del', function () {
var $this = $(this);
var name = $this.data('name');
var uid = $this.data('uid');
var name = $this.data('name');
var the_url = '{% url "api-perms:asset-permission-detail" pk=DEFAULT_PK %}'
.replace('{{ DEFAULT_PK }}', uid);
objectDelete($this, name, the_url);
......
apps/templates/_nav.html
View file @ 08edda35
......@@ -9,7 +9,7 @@
<i class="fa fa-group" style="font-size: 13px"></i> <span class="nav-label">{% trans 'Users' %}</span><span class="fa arrow"></span>
</a>
<ul class="nav nav-second-level active">
<li id="user"><a href="{% url 'users:user-list' %}">{% trans 'User' %}</a></li>
<li id="user"><a href="{% url 'users:user-list' %}">{% trans 'User list' %}</a></li>
<li id="user-group"><a href="{% url 'users:user-group-list' %}">{% trans 'User group' %}</a></li>
<li id="login-log"><a href="{% url 'users:login-log-list' %}">{% trans 'Login logs' %}</a></li>
</ul>
......@@ -19,7 +19,7 @@
<i class="fa fa-inbox"></i> <span class="nav-label">{% trans 'Assets' %}</span><span class="fa arrow"></span>
</a>
<ul class="nav nav-second-level">
<li id="asset"><a href="{% url 'assets:asset-list' %}">{% trans 'Asset' %}</a></li>
<li id="asset"><a href="{% url 'assets:asset-list' %}">{% trans 'Asset list' %}</a></li>
<li id="admin-user"><a href="{% url 'assets:admin-user-list' %}">{% trans 'Admin user' %}</a></li>
<li id="system-user"><a href="{% url 'assets:system-user-list' %}">{% trans 'System user' %}</a></li>
<li id="label"><a href="{% url 'assets:label-list' %}">{% trans 'Labels' %}</a></li>
......@@ -49,7 +49,7 @@
<i class="fa fa-coffee"></i> <span class="nav-label">{% trans 'Job Center' %}</span><span class="fa arrow"></span>
</a>
<ul class="nav nav-second-level">
<li id="task"><a href="{% url 'ops:task-list' %}">{% trans 'Task' %}</a></li>
<li id="task"><a href="{% url 'ops:task-list' %}">{% trans 'Task list' %}</a></li>
</ul>
</li>
{#<li id="">#}
......
apps/users/templates/users/user_profile.html
View file @ 08edda35
......@@ -110,10 +110,6 @@
</table>
</td>
</tr>
<tr>
<td class="text-navy">{% trans 'Perm assets' %}</td>
<td>{{ assets | length }}</td>
</tr>
<tr>
<td class="text-navy">{% trans 'Comment' %}:</td>
<td><b>{{ user.comment }}</b></td>
......
apps/users/views/user.py
View file @ 08edda35
......@@ -308,12 +308,9 @@ class UserProfileView(LoginRequiredMixin, TemplateView):
template_name = 'users/user_profile.html'
def get_context_data(self, **kwargs):
from perms.utils import get_user_granted_assets
assets = get_user_granted_assets(self.request.user)
context = {
'app': _('Users'),
'action': _('Profile'),
'assets': assets,
}
kwargs.update(context)
return super().get_context_data(**kwargs)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment