diff --git a/src/components/RelationCard/index.vue b/src/components/RelationCard/index.vue
index 2f78f83a7..8e93215a1 100644
--- a/src/components/RelationCard/index.vue
+++ b/src/components/RelationCard/index.vue
@@ -22,7 +22,7 @@
-
@@ -83,6 +83,10 @@ export default {
type: [Array, Number, String],
default: () => []
},
+ showHasMore: {
+ type: Boolean,
+ default: true
+ },
performDelete: {
type: Function,
default: (obj, that) => {}
diff --git a/src/layout/components/NavHeader/Tickets.vue b/src/layout/components/NavHeader/Tickets.vue
index aa9373fb1..7ec6cbd29 100644
--- a/src/layout/components/NavHeader/Tickets.vue
+++ b/src/layout/components/NavHeader/Tickets.vue
@@ -1,7 +1,7 @@
-
+
{{ $t('route.Ticket') }}
diff --git a/src/router/userPage.js b/src/router/userPage.js
index 13515adcb..188c230f7 100644
--- a/src/router/userPage.js
+++ b/src/router/userPage.js
@@ -72,6 +72,7 @@ export default [
{
path: '/tickets',
component: Layout,
+ hidden: true,
meta: {
title: i18n.t('route.Tickets'),
icon: 'history',
diff --git a/src/userviews/assets/index.vue b/src/userviews/assets/index.vue
index 7ce76350f..59577f414 100644
--- a/src/userviews/assets/index.vue
+++ b/src/userviews/assets/index.vue
@@ -107,6 +107,9 @@ export default {
name: 'connect',
fa: 'fa-terminal',
type: 'primary',
+ can: (row, cellValue) => {
+ return row.is_active
+ },
callback: function({ row, col, cellValue, reload }) {
window.open(`/luna/?login_to=${cellValue}`, '_blank')
}
diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue
index 13fd1efdb..1186d5193 100644
--- a/src/views/users/User/UserList.vue
+++ b/src/views/users/User/UserList.vue
@@ -88,7 +88,7 @@ export default {
{
name: this.$t('users.InviteUser'),
title: this.$t('users.InviteUser'),
- can:
+ has:
(JSON.parse(this.$cookie.get('jms_current_org'))
? JSON.parse(this.$cookie.get('jms_current_org')).id
: '') !== 'DEFAULT',
diff --git a/src/views/xpack/Org/OrganizationDetail/OrganizationMembershipList.vue b/src/views/xpack/Org/OrganizationDetail/OrganizationMembershipList.vue
index 5f1d0429c..c8c4475e7 100644
--- a/src/views/xpack/Org/OrganizationDetail/OrganizationMembershipList.vue
+++ b/src/views/xpack/Org/OrganizationDetail/OrganizationMembershipList.vue
@@ -86,6 +86,7 @@ export default {
memberRelationConfig: {
icon: 'fa-user',
title: this.$t('xpack.Organization.AddOrgMembers'),
+ showHasMore: false,
objectsAjax: {
url: '/api/v1/users/users/?fields_size=mini&order=name&all=1',
transformOption: (item) => {
|