Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.6.2-rc2 #1093

Merged
merged 5 commits into from
Jun 22, 2024
Merged

3.6.2-rc2 #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c678de
PLAN-1001 Bold name in confirmation dialog
Gailbear Jun 22, 2024
ba1fd4a
PLAN-1001 fix errors with bolded name
Gailbear Jun 22, 2024
2fcad8c
disable unlink and link if not admin
balen Jun 22, 2024
f76db95
Merge pull request #1091 from PlanoramaEvents/plan-1001-bold-name
balen Jun 22, 2024
700208e
Merge pull request #1092 from PlanoramaEvents/plan-1000-access-contro…
balen Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/javascript/constants/strings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ const twoLines = (line1, line2) => (h) => h('p', {}, [line1, h('br'), line2]);
const errorMessage = (message) => (errorCode) => twoLines(message, `Error code: ${errorCode}`);
const titleCase = (model) => `${model.substring(0, 1).toUpperCase()}${model.substring(1)}`;
const nLines = (lines) => (h) => h('p', {}, lines.reduce((p, c) => [...p, c, h('br')], []));
const bold = (text) => (h) => h('strong', {}, text);

module.exports = {
// login page
Expand Down Expand Up @@ -371,5 +370,4 @@ module.exports = {
REG_ID_NOT_FOUND: "No results found. Please check your input.",
REG_ID_UNLINK_BUTTON: "Unlink Current Registration",
REG_ID_UNLINK_CONFIRMATION_TITLE: "",
REG_ID_UNLINK_CONFIRMATION_TEXT: (name, number) => `This will unlink ${name} from Ticket Number ${number}.`,
}
11 changes: 4 additions & 7 deletions app/javascript/people/people_admin_tab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,15 @@
nullText="Unknown"
>
<template #registration_number-val-end>
<edit-button v-if="currentUserIsAdmin" v-b-modal.edit-reg-number id="reg-number-edit-button"></edit-button>
<edit-button :disabled="!currentUserIsAdmin" v-b-modal.edit-reg-number id="reg-number-edit-button"></edit-button>
<icon-button
modal="unlink-confirmation"
:disabled="!selected.registration_number"
:disabled="!selected.registration_number || !currentUserIsAdmin"
:tooltip="REG_ID_UNLINK_BUTTON"
disabledTooltip="No Ticket Number to unlink"
disabledTooltip="You are not an Admin or there is No Ticket Number to unlink"
background="none"
variant="danger"
icon="trash-fill"
v-if="currentUserIsAdmin"
></icon-button>
</template>
</dl-person>
Expand Down Expand Up @@ -54,7 +53,7 @@
@ok="unlinkPerson()"
:title="REG_ID_UNLINK_CONFIRMATION_TITLE"
>
{{ REG_ID_UNLINK_CONFIRMATION_TEXT(selected.published_name, selected.registration_number) }}
This will unlink <strong>{{ selected.published_name }}</strong> from Ticket Number {{selected.registration_number}}.
</plano-modal>
</div>
</template>
Expand All @@ -75,7 +74,6 @@ import {
PERSON_UNLINK_SUCCESS,
PERSON_UNLINK_FAILURE,
REG_ID_UNLINK_CONFIRMATION_TITLE,
REG_ID_UNLINK_CONFIRMATION_TEXT,
REG_ID_UNLINK_BUTTON,
} from "@/constants/strings";
import { mapActions } from "vuex";
Expand Down Expand Up @@ -103,7 +101,6 @@ export default {
model,
PERSON_CON_STATE,
REG_ID_UNLINK_CONFIRMATION_TITLE,
REG_ID_UNLINK_CONFIRMATION_TEXT,
REG_ID_UNLINK_BUTTON,
}),
computed: {
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/people/person-edit-reg-number.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</div>
</div>
</edit-modal>
<plano-modal id="unmatch-match">This will unlink {{ matchedPerson }} from ticket number {{ selectedRegNumber }}, and link to the current profile.
<plano-modal id="unmatch-match">This will unlink <strong>{{ matchedPerson }}</strong> from ticket number {{ selectedRegNumber }}, and link to the current profile.
<template #modal-footer="{ok, cancel}">
<b-button variant="link" @click="cancel()">Cancel</b-button>
<spinner-button variant="danger" :loading="unlinkLinkLoading" @click="unlinkLink(ok)">Ok</spinner-button>
Expand Down
Loading