[Update] Merge local branch dev to master

apps/locale/zh/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-20 17:55+0800\n"
+"POT-Creation-Date: 2019-06-25 15:22+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"
@@ -76,7 +76,7 @@ msgstr "运行参数"
 #: applications/templates/applications/remote_app_list.html:22
 #: applications/templates/applications/user_remote_app_list.html:18
 #: assets/forms/domain.py:15 assets/forms/label.py:13
-#: assets/models/asset.py:315 assets/models/authbook.py:27
+#: assets/models/asset.py:319 assets/models/authbook.py:27
 #: assets/serializers/admin_user.py:24 assets/serializers/asset_user.py:105
 #: assets/serializers/system_user.py:28
 #: assets/templates/assets/admin_user_list.html:49
@@ -1005,7 +1005,7 @@ msgid "Operator"
 msgstr "运营商"
 
 #: assets/models/cluster.py:36 assets/models/group.py:34
-#: perms/utils/asset_permission.py:63
+#: perms/utils/asset_permission.py:64
 msgid "Default"
 msgstr "默认"
 
@@ -1210,24 +1210,25 @@ msgstr "登录模式"
 msgid "%(value)s is not an even number"
 msgstr "%(value)s is not an even number"
 
-#: assets/serializers/asset.py:46 assets/templates/assets/asset_create.html:24
+#: assets/serializers/asset.py:44 assets/serializers/asset.py:154
+#: assets/templates/assets/asset_create.html:24
 msgid "Protocols"
 msgstr "协议组"
 
-#: assets/serializers/asset.py:73
+#: assets/serializers/asset.py:71
 msgid "Hardware info"
 msgstr "硬件信息"
 
-#: assets/serializers/asset.py:74 assets/serializers/asset_user.py:29
+#: assets/serializers/asset.py:72 assets/serializers/asset_user.py:29
 #: assets/templates/assets/_asset_user_list.html:18
 msgid "Connectivity"
 msgstr "连接"
 
-#: assets/serializers/asset.py:75 orgs/mixins.py:223
+#: assets/serializers/asset.py:73 orgs/mixins.py:223
 msgid "Org name"
 msgstr "组织名称"
 
-#: assets/serializers/asset.py:93
+#: assets/serializers/asset.py:91
 msgid "Protocol duplicate: {}"
 msgstr "协议重复: {}"
 
@@ -1293,54 +1294,54 @@ msgstr "更新资产硬件信息: {}"
 msgid "Test assets connectivity"
 msgstr "测试资产可连接性"
 
-#: assets/tasks.py:229
+#: assets/tasks.py:233
 msgid "Test assets connectivity: {}"
 msgstr "测试资产可连接性: {}"
 
-#: assets/tasks.py:271
+#: assets/tasks.py:275
 msgid "Test admin user connectivity period: {}"
 msgstr "定期测试管理账号可连接性: {}"
 
-#: assets/tasks.py:278
+#: assets/tasks.py:282
 msgid "Test admin user connectivity: {}"
 msgstr "测试管理行号可连接性: {}"
 
-#: assets/tasks.py:348
+#: assets/tasks.py:355
 msgid "Test system user connectivity: {}"
 msgstr "测试系统用户可连接性: {}"
 
-#: assets/tasks.py:355
+#: assets/tasks.py:362
 msgid "Test system user connectivity: {} => {}"
 msgstr "测试系统用户可连接性: {} => {}"
 
-#: assets/tasks.py:368
+#: assets/tasks.py:375
 msgid "Test system user connectivity period: {}"
 msgstr "定期测试系统用户可连接性: {}"
 
-#: assets/tasks.py:469 assets/tasks.py:555
+#: assets/tasks.py:476 assets/tasks.py:562
 #: xpack/plugins/change_auth_plan/models.py:522
 msgid "The asset {} system platform {} does not support run Ansible tasks"
 msgstr "资产 {} 系统平台 {} 不支持运行 Ansible 任务"
 
-#: assets/tasks.py:481
+#: assets/tasks.py:488
 msgid ""
 "Push system user task skip, auto push not enable or protocol is not ssh or "
 "rdp: {}"
 msgstr "推送系统用户任务跳过，自动推送没有打开，或协议不是ssh或rdp: {}"
 
-#: assets/tasks.py:488
+#: assets/tasks.py:495
 msgid "For security, do not push user {}"
 msgstr "为了安全，禁止推送用户 {}"
 
-#: assets/tasks.py:516 assets/tasks.py:530
+#: assets/tasks.py:523 assets/tasks.py:537
 msgid "Push system users to assets: {}"
 msgstr "推送系统用户到入资产: {}"
 
-#: assets/tasks.py:522
+#: assets/tasks.py:529
 msgid "Push system users to asset: {} => {}"
 msgstr "推送系统用户到入资产: {} => {}"
 
-#: assets/tasks.py:612
+#: assets/tasks.py:619
 msgid "Test asset user connectivity: {}"
 msgstr "测试资产用户可连接性: {}"
 
@@ -2321,8 +2322,8 @@ msgid "Date"
 msgstr "日期"
 
 #: audits/views.py:85 audits/views.py:129 audits/views.py:166
-#: audits/views.py:211 audits/views.py:243 ops/views/command.py:47
-#: templates/_nav.html:87 templates/_nav_audits.html:22
+#: audits/views.py:211 audits/views.py:243 templates/_nav.html:87
+#: templates/_nav_audits.html:22
 msgid "Audits"
 msgstr "日志审计"
 
@@ -2988,7 +2989,7 @@ msgstr "更新任务内容: {}"
 
 #: ops/views/adhoc.py:45 ops/views/adhoc.py:71 ops/views/adhoc.py:85
 #: ops/views/adhoc.py:99 ops/views/adhoc.py:113 ops/views/adhoc.py:127
-#: ops/views/adhoc.py:141 ops/views/command.py:72
+#: ops/views/adhoc.py:141 ops/views/command.py:47 ops/views/command.py:72
 msgid "Ops"
 msgstr "作业中心"
 

apps/perms/api/user_permission.py

@@ -14,7 +14,6 @@ from rest_framework.pagination import LimitOffsetPagination
 from common.permissions import IsValidUser, IsOrgAdminOrAppUser
 from common.tree import TreeNodeSerializer
 from common.utils import get_logger
-from orgs.utils import set_to_root_org
 from ..utils import (
     AssetPermissionUtil, parse_asset_to_tree_node, parse_node_to_tree_node,
     check_system_user_action, RemoteAppPermissionUtil,
@@ -513,6 +512,7 @@ class ValidateUserRemoteAppPermissionApi(APIView):
     permission_classes = (IsOrgAdminOrAppUser,)
 
     def get(self, request, *args, **kwargs):
+        self.change_org_if_need(request, kwargs)
         user_id = request.query_params.get('user_id', '')
         remote_app_id = request.query_params.get('remote_app_id', '')
         user = get_object_or_404(User, id=user_id)