github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-09-19 17:54:37 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ibuler
2020-06-10 20:07:28 +08:00
parent 68390ea3ea 8270767076
commit 03dc949e26
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/users/User/UserDetail/UserInfo.vue
View File

@@ -6,7 +6,7 @@
<el-col :md="10" :sm="24"> <el-col :md="10" :sm="24">
<QuickActions :actions="quickActions" type="primary" /> <QuickActions :actions="quickActions" type="primary" />
<RelationCard v-bind="relationConfig" type="info" style="margin-top: 15px" /> <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" /> <RelationCard v-if="this.$store.getters.publicSettings.LOGIN_CONFIRM_ENABLE" v-bind="loginConfirmSetting" type="danger" style="margin-top: 15px" />
</el-col> </el-col>
</el-row> </el-row>
</template> </template>
@@ -204,7 +204,7 @@ export default {
const objectId = this.object.id const objectId = this.object.id
const relationUrl = `/api/v1/authentication/login-confirm-settings/${objectId}/` const relationUrl = `/api/v1/authentication/login-confirm-settings/${objectId}/`
const data = { const data = {
reviewers: [...this.object.login_confirm_settings, ...items.map(v => { reviewers: [...this.object.login_confirm_settings || [], ...items.map(v => {
return v.value return v.value
})] })]
} }