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

This commit is contained in:
ibuler
2025-01-06 11:27:55 +08:00
4 changed files with 6 additions and 3 deletions

View File

@@ -82,5 +82,6 @@ h3 {
.ellipsis {
text-align: center;
cursor: pointer;
}
</style>

View File

@@ -106,7 +106,9 @@ export default {
computed: {
...mapGetters(['currentOrgIsRoot']),
iHasQuickFilter() {
const has = this.quickFilters && this.quickFilters.length > 0
const has =
(this.quickFilters && this.quickFilters.length > 0) ||
(this.quickSummary && this.quickSummary.length > 0)
return !!has
},
dataTable() {

View File

@@ -43,7 +43,7 @@ export default {
[this.$t('Automations'), ['params']],
[this.$t('Periodic'), ['is_periodic', 'interval', 'crontab']],
[this.$t('Notification'), ['recipients']],
[this.$t('Other'), ['is_active', 'comment']]
[this.$t('Other'), ['check_conn_after_change', 'is_active', 'comment']]
],
fieldsMeta: {
...getChangeSecretFields(),

View File

@@ -45,7 +45,7 @@ export default {
this.$t('Automations'), ['params']
],
[this.$t('Periodic'), ['is_periodic', 'interval', 'crontab']],
[this.$t('Other'), ['is_active', 'comment']]
[this.$t('Other'), ['check_conn_after_change', 'is_active', 'comment']]
],
fieldsMeta: {
...periodicMeta,