mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-07-08 04:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix error when expanding conditional role

Browse source
This commit is contained in:
Hazelnoot 2025-05-10 12:30:55 -04:00
parent b9109e5bb3
commit 1fcca626ca
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
locales/index.d.ts vendored
View file

@ -13129,6 +13129,18 @@ export interface Locale extends ILocale {
* The date is the IP address was first acknowledged. * The date is the IP address was first acknowledged.
*/ */
"ipTip": string; "ipTip": string;
/**
* Period
*/
"rolePeriod": string;
/**
* Assigned
*/
"roleAssigned": string;
/**
* automatic
*/
"roleAutomatic": string;
/** /**
* Translation timeout * Translation timeout
*/ */

11
packages/frontend/src/pages/admin-user.vue
View file

@ -170,9 +170,14 @@ SPDX-License-Identifier: AGPL-3.0-only
<button v-else class="_button" :class="$style.roleUnassign" disabled><i class="ti ti-ban"></i></button> <button v-else class="_button" :class="$style.roleUnassign" disabled><i class="ti ti-ban"></i></button>
</div> </div>
<div v-if="expandedRoles.includes(role.id)" :class="$style.roleItemSub"> <div v-if="expandedRoles.includes(role.id)" :class="$style.roleItemSub">
<div>Assigned: <MkTime :time="info.roleAssigns.find(a => a.roleId === role.id).createdAt" mode="detail"/></div> <template v-if="info.roleAssigns.some(a => a.roleId === role.id)">
<div v-if="info.roleAssigns.find(a => a.roleId === role.id).expiresAt">Period: {{ new Date(info.roleAssigns.find(a => a.roleId === role.id).expiresAt).toLocaleString() }}</div> <div>{{ i18n.ts.roleAssigned }}: <MkTime :time="info.roleAssigns.find(a => a.roleId === role.id).createdAt" mode="detail"/></div>
<div v-else>Period: {{ i18n.ts.indefinitely }}</div> <div v-if="info.roleAssigns.find(a => a.roleId === role.id).expiresAt">{{ i18n.ts.rolePeriod }}: {{ new Date(info.roleAssigns.find(a => a.roleId === role.id).expiresAt).toLocaleString() }}</div>
<div v-else>{{ i18n.ts.rolePeriod }}: {{ i18n.ts.indefinitely }}</div>
</template>
<template v-else>
<div>{{ i18n.ts.roleAssigned }}: {{ i18n.ts.roleAutomatic }}</div>
</template>
</div> </div>
</div> </div>
</div> </div>

3
sharkey-locales/en-US.yml
View file

@ -580,6 +580,9 @@ updateRemoteUser: "Refresh remote data"
activityPub: "Activity Pub" activityPub: "Activity Pub"
ip: "IP" ip: "IP"
ipTip: "The date is the IP address was first acknowledged." ipTip: "The date is the IP address was first acknowledged."
rolePeriod: "Period"
roleAssigned: "Assigned"
roleAutomatic: "automatic"
translationTimeoutLabel: "Translation timeout" translationTimeoutLabel: "Translation timeout"
translationTimeoutCaption: "Timeout in milliseconds for translation API requests." translationTimeoutCaption: "Timeout in milliseconds for translation API requests."