This commit is contained in:
luce 2025-09-16 09:24:02 +02:00
commit 55c2b9995a
4 changed files with 68 additions and 53 deletions

View file

@ -81,7 +81,7 @@
class="main-button" class="main-button"
@click="confirmAction('confirmDeactivate')" @click="confirmAction('confirmDeactivate')"
> >
{{ $t('admin_dash.users.deactivate') }} {{ $t('admin_dash.users.actions.deactivate') }}
</button> </button>
</div> </div>
</div> </div>
@ -91,7 +91,7 @@
class="main-button" class="main-button"
@click="confirmAction('confirmDeleteUser')" @click="confirmAction('confirmDeleteUser')"
> >
{{ $t('admin_dash.users.delete') }} {{ $t('admin_dash.users.actions.delete_user') }}
</button> </button>
</div> </div>
</div> </div>
@ -104,7 +104,7 @@
class="main-button" class="main-button"
@click="confirmAction('confirmGrantAdmin')" @click="confirmAction('confirmGrantAdmin')"
> >
{{ $t('admin_dash.users.grant_admin') }} {{ $t('admin_dash.users.actions.grant_admin') }}
</button> </button>
</div> </div>
</div> </div>
@ -117,7 +117,7 @@
class="main-button" class="main-button"
@click="confirmAction('confirmRevokeAdmin')" @click="confirmAction('confirmRevokeAdmin')"
> >
{{ $t('admin_dash.users.revoke_admin') }} {{ $t('admin_dash.users.actions.revoke_admin') }}
</button> </button>
</div> </div>
</div> </div>
@ -130,7 +130,7 @@
class="main-button" class="main-button"
@click="confirmAction('confirmGrantModerator')" @click="confirmAction('confirmGrantModerator')"
> >
{{ $t('admin_dash.users.grant_moderator') }} {{ $t('admin_dash.users.actions.grant_moderator') }}
</button> </button>
</div> </div>
</div> </div>
@ -143,7 +143,7 @@
class="main-button" class="main-button"
@click="confirmAction('confirmRevokeModerator')" @click="confirmAction('confirmRevokeModerator')"
> >
{{ $t('admin_dash.users.revoke_moderator') }} {{ $t('admin_dash.users.actions.revoke_moderator') }}
</button> </button>
</div> </div>
</div> </div>
@ -156,7 +156,7 @@
class="main-button" class="main-button"
@click="confirmAction('confirmApprove')" @click="confirmAction('confirmApprove')"
> >
{{ $t('admin_dash.users.approve') }} {{ $t('admin_dash.users.actions.approve') }}
</button> </button>
</div> </div>
</div> </div>
@ -169,7 +169,7 @@
class="main-button" class="main-button"
@click="confirmAction('confirmConfirm')" @click="confirmAction('confirmConfirm')"
> >
{{ $t('admin_dash.users.confirm') }} {{ $t('admin_dash.users.actions.confirm') }}
</button> </button>
</div> </div>
</div> </div>
@ -179,7 +179,7 @@
class="main-button" class="main-button"
@click="confirmAction('confirmResendConfirmationEmail')" @click="confirmAction('confirmResendConfirmationEmail')"
> >
{{ $t('admin_dash.users.resend_confirmation_email') }} {{ $t('admin_dash.users.actions.resend_confirmation_email') }}
</button> </button>
</div> </div>
</div> </div>
@ -189,7 +189,7 @@
class="main-button" class="main-button"
@click="confirmAction('confirmRequirePasswordChange')" @click="confirmAction('confirmRequirePasswordChange')"
> >
{{ $t('admin_dash.users.require_password_change') }} {{ $t('admin_dash.users.actions.require_password_change') }}
</button> </button>
</div> </div>
</div> </div>
@ -199,7 +199,7 @@
class="main-button" class="main-button"
@click="confirmAction('confirmDisableMFA')" @click="confirmAction('confirmDisableMFA')"
> >
{{ $t('admin_dash.users.disable_mfa') }} {{ $t('admin_dash.users.actions.disable_mfa') }}
</button> </button>
</div> </div>
</div> </div>
@ -397,105 +397,118 @@
<GenericConfirm <GenericConfirm
ref="confirmActivate" ref="confirmActivate"
style="z-index: 10000;" style="z-index: 10000;"
:title="$t('admin_dash.users.bulk_actions.activate')" :title="$t('admin_dash.users.actions.confirm_single.title')"
:cancel-text="$t('admin_dash.users.bulk_actions.no')" :message="$t('admin_dash.users.actions.confirm_single.activate')"
:confirm-text="$t('admin_dash.users.bulk_actions.yes')" :cancel-text="$t('admin_dash.users.actions.no')"
:confirm-text="$t('admin_dash.users.actions.yes')"
@action="userActionConfirmed('adminActivateUser')" @action="userActionConfirmed('adminActivateUser')"
/> />
<GenericConfirm <GenericConfirm
ref="confirmDeactivate" ref="confirmDeactivate"
style="z-index: 10000;" style="z-index: 10000;"
:title="$t('admin_dash.users.bulk_actions.deactivate')" :title="$t('admin_dash.users.actions.confirm_single.title')"
:cancel-text="$t('admin_dash.users.bulk_actions.no')" :message="$t('admin_dash.users.actions.confirm_single.deactivate')"
:confirm-text="$t('admin_dash.users.bulk_actions.yes')" :cancel-text="$t('admin_dash.users.actions.no')"
:confirm-text="$t('admin_dash.users.actions.yes')"
@action="userActionConfirmed('adminDeactivateUser')" @action="userActionConfirmed('adminDeactivateUser')"
/> />
<GenericConfirm <GenericConfirm
ref="confirmDeleteUser" ref="confirmDeleteUser"
style="z-index: 10000;" style="z-index: 10000;"
:title="$t('admin_dash.users.bulk_actions.delete_user')" :title="$t('admin_dash.users.actions.confirm_single.title')"
:cancel-text="$t('admin_dash.users.bulk_actions.no')" :message="$t('admin_dash.users.actions.confirm_single.delete_user')"
:confirm-text="$t('admin_dash.users.bulk_actions.yes')" :cancel-text="$t('admin_dash.users.actions.no')"
:confirm-text="$t('admin_dash.users.actions.yes')"
@action="userActionConfirmed('adminDeleteUser')" @action="userActionConfirmed('adminDeleteUser')"
/> />
<GenericConfirm <GenericConfirm
ref="confirmGrantAdmin" ref="confirmGrantAdmin"
style="z-index: 10000;" style="z-index: 10000;"
:title="$t('admin_dash.users.bulk_actions.grant_moderator')" :title="$t('admin_dash.users.actions.confirm_single.title')"
:cancel-text="$t('admin_dash.users.bulk_actions.no')" :message="$t('admin_dash.users.actions.confirm_single.grant_admin')"
:confirm-text="$t('admin_dash.users.bulk_actions.yes')" :cancel-text="$t('admin_dash.users.actions.no')"
:confirm-text="$t('admin_dash.users.actions.yes')"
@action="userActionConfirmed('adminAddUserToAdminGroup')" @action="userActionConfirmed('adminAddUserToAdminGroup')"
/> />
<GenericConfirm <GenericConfirm
ref="confirmRevokeAdmin" ref="confirmRevokeAdmin"
style="z-index: 10000;" style="z-index: 10000;"
:title="$t('admin_dash.users.bulk_actions.revoke_admin')" :title="$t('admin_dash.users.actions.confirm_single.title')"
:cancel-text="$t('admin_dash.users.bulk_actions.no')" :message="$t('admin_dash.users.actions.confirm_single.revoke_admin')"
:confirm-text="$t('admin_dash.users.bulk_actions.yes')" :cancel-text="$t('admin_dash.users.actions.no')"
:confirm-text="$t('admin_dash.users.actions.yes')"
@action="userActionConfirmed('adminRemoveUserFromAdminGroup')" @action="userActionConfirmed('adminRemoveUserFromAdminGroup')"
/> />
<GenericConfirm <GenericConfirm
ref="confirmGrantModerator" ref="confirmGrantModerator"
style="z-index: 10000;" style="z-index: 10000;"
:title="$t('admin_dash.users.bulk_actions.grant_moderator')" :title="$t('admin_dash.users.actions.confirm_single.title')"
:cancel-text="$t('admin_dash.users.bulk_actions.no')" :message="$t('admin_dash.users.actions.confirm_single.grant_moderator')"
:confirm-text="$t('admin_dash.users.bulk_actions.yes')" :cancel-text="$t('admin_dash.users.actions.no')"
:confirm-text="$t('admin_dash.users.actions.yes')"
@action="userActionConfirmed('adminAddUserToModeratorGroup')" @action="userActionConfirmed('adminAddUserToModeratorGroup')"
/> />
<GenericConfirm <GenericConfirm
ref="confirmRevokeModerator" ref="confirmRevokeModerator"
style="z-index: 10000;" style="z-index: 10000;"
:title="$t('admin_dash.users.bulk_actions.revoke_moderator')" :title="$t('admin_dash.users.actions.confirm_single.title')"
:cancel-text="$t('admin_dash.users.bulk_actions.no')" :message="$t('admin_dash.users.actions.confirm_single.revoke_moderator')"
:confirm-text="$t('admin_dash.users.bulk_actions.yes')" :cancel-text="$t('admin_dash.users.actions.no')"
:confirm-text="$t('admin_dash.users.actions.yes')"
@action="userActionConfirmed('adminRemoveUserFromModeratorGroup')" @action="userActionConfirmed('adminRemoveUserFromModeratorGroup')"
/> />
<GenericConfirm <GenericConfirm
ref="confirmApprove" ref="confirmApprove"
style="z-index: 10000;" style="z-index: 10000;"
:title="$t('admin_dash.users.bulk_actions.approve')" :title="$t('admin_dash.users.actions.confirm_single.title')"
:cancel-text="$t('admin_dash.users.bulk_actions.no')" :message="$t('admin_dash.users.actions.confirm_single.approve')"
:confirm-text="$t('admin_dash.users.bulk_actions.yes')" :cancel-text="$t('admin_dash.users.actions.no')"
:confirm-text="$t('admin_dash.users.actions.yes')"
@action="userActionConfirmed('adminApproveUser')" @action="userActionConfirmed('adminApproveUser')"
/> />
<GenericConfirm <GenericConfirm
ref="confirmConfirm" ref="confirmConfirm"
style="z-index: 10000;" style="z-index: 10000;"
:title="$t('admin_dash.users.bulk_actions.confirm')" :title="$t('admin_dash.users.actions.confirm_single.title')"
:cancel-text="$t('admin_dash.users.bulk_actions.no')" :message="$t('admin_dash.users.actions.confirm_single.confirm')"
:confirm-text="$t('admin_dash.users.bulk_actions.yes')" :cancel-text="$t('admin_dash.users.actions.no')"
:confirm-text="$t('admin_dash.users.actions.yes')"
@action="userActionConfirmed('adminConfirmUser')" @action="userActionConfirmed('adminConfirmUser')"
/> />
<GenericConfirm <GenericConfirm
ref="confirmResendConfirmationEmail" ref="confirmResendConfirmationEmail"
style="z-index: 10000;" style="z-index: 10000;"
:title="$t('admin_dash.users.bulk_actions.resend_confirmation_email')" :title="$t('admin_dash.users.actions.confirm_single.title')"
:cancel-text="$t('admin_dash.users.bulk_actions.no')" :message="$t('admin_dash.users.actions.confirm_single.resend_confirmation_email')"
:confirm-text="$t('admin_dash.users.bulk_actions.yes')" :cancel-text="$t('admin_dash.users.actions.no')"
:confirm-text="$t('admin_dash.users.actions.yes')"
@action="userActionConfirmed('adminResendConfirmationEmail')" @action="userActionConfirmed('adminResendConfirmationEmail')"
/> />
<GenericConfirm <GenericConfirm
ref="confirmRequirePasswordChange" ref="confirmRequirePasswordChange"
style="z-index: 10000;" style="z-index: 10000;"
:title="$t('admin_dash.users.bulk_actions.require_password_change')" :title="$t('admin_dash.users.actions.confirm_single.title')"
:cancel-text="$t('admin_dash.users.bulk_actions.no')" :message="$t('admin_dash.users.actions.confirm_single.require_password_change')"
:confirm-text="$t('admin_dash.users.bulk_actions.yes')" :cancel-text="$t('admin_dash.users.actions.no')"
:confirm-text="$t('admin_dash.users.actions.yes')"
@action="userActionConfirmed('adminRequirePasswordChange')" @action="userActionConfirmed('adminRequirePasswordChange')"
/> />
<GenericConfirm <GenericConfirm
ref="confirmDisableMFA" ref="confirmDisableMFA"
style="z-index: 10000;" style="z-index: 10000;"
:title="$t('admin_dash.users.bulk_actions.disable_mfa')" :title="$t('admin_dash.users.actions.confirm_single.title')"
:cancel-text="$t('admin_dash.users.bulk_actions.no')" :message="$t('admin_dash.users.actions.confirm_single.disable_mfa')"
:confirm-text="$t('admin_dash.users.bulk_actions.yes')" :cancel-text="$t('admin_dash.users.actions.no')"
:confirm-text="$t('admin_dash.users.actions.yes')"
@action="userActionConfirmed('adminDisableMFA')" @action="userActionConfirmed('adminDisableMFA')"
/> />
<TextConfirm <TextConfirm
ref="addTextBox" ref="addTextBox"
style="z-index: 10001;" style="z-index: 10001;"
:title="$t('admin_dash.users.tags.new_title')" :title="$t('admin_dash.users.tags.add_new')"
:cancel-text="$t('admin_dash.users.tags.no')" :message="$t('admin_dash.users.tags.new_title')"
:confirm-text="$t('admin_dash.users.tags.yes')" :cancel-text="$t('admin_dash.users.actions.no')"
:confirm-text="$t('admin_dash.users.actions.yes')"
@action="addUserTag" @action="addUserTag"
/> />
</template> </template>

View file

@ -134,6 +134,8 @@ const UsersTab = {
const s = this.$refs.userList.getSelected() const s = this.$refs.userList.getSelected()
s.forEach(u => { s.forEach(u => {
if (restricted.includes(action) !== false || u.id !== this.$store.state.users.currentUser.id) { if (restricted.includes(action) !== false || u.id !== this.$store.state.users.currentUser.id) {
const uf = this.$store.getters.findUser(u.id)
console.log('user: ', uf)
this.$store.dispatch(action, this.$store.getters.findUser(u.id)) this.$store.dispatch(action, this.$store.getters.findUser(u.id))
} }
}) })

View file

@ -335,7 +335,7 @@
<GenericConfirm <GenericConfirm
ref="confirmDisableMFA" ref="confirmDisableMFA"
:title="$t('admin_dash.users.actions.confirm_multi.title')" :title="$t('admin_dash.users.actions.confirm_multi.title')"
:message="$t('admin_dash.users.actions.disable_mfa')" :message="$t('admin_dash.users.actions.confirm_multi.disable_mfa')"
:cancel-text="$t('admin_dash.users.actions.no')" :cancel-text="$t('admin_dash.users.actions.no')"
:confirm-text="$t('admin_dash.users.actions.yes')" :confirm-text="$t('admin_dash.users.actions.yes')"
@action="selectionConfirmed('adminDisableMFA')" @action="selectionConfirmed('adminDisableMFA')"

View file

@ -114,8 +114,8 @@ const adminSettingsStorage = {
adminChangeStatusScope (store, { opts }) { adminChangeStatusScope (store, { opts }) {
return store.rootState.api.backendInteractor.adminChangeStatusScope({ opts }) return store.rootState.api.backendInteractor.adminChangeStatusScope({ opts })
}, },
adminDisableMFA (store, { opts }) { adminDisableMFA (store, user) {
return store.rootState.api.backendInteractor.adminDisableMFA({ opts }) return store.rootState.api.backendInteractor.adminDisableMFA({ user })
}, },
adminTagUser (store, { user, tag }) { adminTagUser (store, { user, tag }) {
return store.rootState.api.backendInteractor.tagUser({ user, tag }) return store.rootState.api.backendInteractor.tagUser({ user, tag })