Merge branch 'dev' of github.com:jumpserver/lina into dev

src/i18n/langs/cn.json

@@ -676,6 +676,7 @@
     "RunUser": "运行用户"
   },
   "users": {
+    "LoginConfirm": "登录确认人",
     "SSHKey": "SSH公钥",
     "TermsAndConditions": "条款和条件",
     "IAgree": "我同意",

src/i18n/langs/en.json

@@ -659,6 +659,7 @@
     "RenameNode": "Rename node"
   },
   "users": {
+    "LoginConfirm": "Login approvers",
     "SSHKey": "SSH Key",
     "TermsAndConditions": "Terms and conditions",
     "IAgree": "I agree",

src/views/users/User/UserDetail/UserInfo.vue

@@ -6,6 +6,7 @@
     <el-col :md="10" :sm="24">
       <QuickActions :actions="quickActions" type="primary" />
       <RelationCard v-bind="relationConfig" type="info" style="margin-top: 15px" />
+      <RelationCard v-if="this.$store.getters.publicSettings.LOGIN_CONFIRM_ENABLE" v-bind="loginConfirmSetting" type="info" style="margin-top: 15px" />
     </el-col>
   </el-row>
 </template>
@@ -183,6 +184,32 @@ export default {
           })
           return this.$axios.post(relationUrl, data)
         }
+      },
+      loginConfirmSetting: {
+        icon: 'fa-user',
+        title: this.$t('users.LoginConfirm'),
+        objectsAjax: {
+          url: '/api/v1/users/users/'
+        },
+        hasObjectsId: this.object.login_confirm_settings,
+        performDelete: (item) => {
+          const objectId = this.object.id
+          const relationUrl = `/api/v1/authentication/login-confirm-settings/${objectId}/`
+          const data = {
+            reviewers: this.object.login_confirm_settings.filter(approver => approver !== item.value)
+          }
+          return this.$axios.patch(relationUrl, data)
+        },
+        performAdd: (items) => {
+          const objectId = this.object.id
+          const relationUrl = `/api/v1/authentication/login-confirm-settings/${objectId}/`
+          const data = {
+            reviewers: [...this.object.login_confirm_settings, ...items.map(v => {
+              return v.value
+            })]
+          }
+          return this.$axios.patch(relationUrl, data)
+        }
       }
     }
   },

src/views/xpack/Cloud/Account/AccountCreateUpdate.vue

@@ -20,7 +20,9 @@ export default {
       ],
       url: '/api/v1/xpack/cloud/accounts/',
       fieldsMeta: {
-      }
+      },
+      updateSuccessNextRoute: { name: 'CloudCenter' },
+      createSuccessNextRoute: { name: 'CloudCenter' }
     }
   }
 }

src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue

@@ -85,7 +85,9 @@ export default {
             }
           }
         }
-      }
+      },
+      updateSuccessNextRoute: { name: 'CloudCenter' },
+      createSuccessNextRoute: { name: 'CloudCenter' }
     }
   }
 }

src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue

@@ -17,7 +17,18 @@ export default {
           'name', 'account_name', 'history_count', 'instance_count', 'periodic_display',
           'date_last_sync', 'comment', 'actions'
         ],
-        columnsMeta: {}
+        columnsMeta: {
+          actions: {
+            formatterArgs: {
+              onUpdate: ({ row }) => {
+                this.$router.push({ name: 'SyncInstanceTaskUpdate', params: { id: row.id }})
+              }
+            }
+          },
+          name: {
+            formatter: null
+          }
+        }
       },
       headerActions: {
         hasBulkDelete: false,