Merge pull request #514 from jumpserver/dev

Merge dev
jumpserver · Nov 18, 2020 · 14286b9 · 14286b9
2 parents 266d107 + 0498db9
commit 14286b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue
@@ -191,7 +191,7 @@ export default {
             if (formValue.update_password || formValue.protocol === 'k8s') {
               return true
             }
-            if (formValue.login_mode === 'login_mode') {
+            if (formValue.login_mode === 'manual') {
               return true
             }
             return !this.$route.params.id

diff --git a/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/ApplicationsPermission.vue b/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/ApplicationsPermission.vue
@@ -99,7 +99,7 @@ export default {
         icon: 'fa-edit',
         title: this.$t('perms.addSystemUserToThisPermission'),
         objectsAjax: {
-          url: `/api/v1/assets/system-users/?category=${vm.object.category}&type=${vm.object.type}`,
+          url: vm.object.category === 'remote_app' ? `/api/v1/assets/system-users/?protocol=rdp` : `/api/v1/assets/system-users/?protocol=${vm.object.type}`,
           transformOption: (item) => {
             return { label: item.name + ' (' + item.username + ')', value: item.id }
           }