Skip to content

Fix "undefined" Tooltip Messages #3364

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

Merged
gjacob24 merged 3 commits into from
Apr 8, 2024
Merged

Fix "undefined" Tooltip Messages #3364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7312151
Call getConstant() after constants.js callback
aaronskiba Jan 15, 2024
83f16f8
Put back constant for passwordHelper.js
aaronskiba Jan 15, 2024
831d6d3
Update CHANGELOG.md
aaronskiba Mar 27, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ We sometimes use the button native Dom element to programmatically click, as the
### Fixed
- Fixed rubocop errors after Bootstrap upgrade
- Fixed RSpec tests after Bootstrap upgrade
- Fix "undefined" Tooltip Messages [#3364](https://github.com/DMPRoadmap/roadmap/pull/3364)

## V4.1.1

Expand Down
3 changes: 2 additions & 1 deletion app/javascript/src/utils/requiredField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import getConstant from './constants';
import { isObject } from './isType';

const asterisk = `<span class="red" title="${getConstant('REQUIRED_FIELD_TEXT')}">* </span>`;
var asterisk;

export const addAsterisk = (el) => {
const target = $(el);
Expand Down Expand Up @@ -32,5 +32,6 @@ export const addAsterisks = (el) => {
};

$(() => {
asterisk = `<span class="red" title="${getConstant('REQUIRED_FIELD_TEXT')}">* </span>`;
addAsterisks('body');
});
1 change: 1 addition & 0 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
MAX_NUMBER_GUIDANCE_SELECTIONS: 6,

REQUIRED_FIELD_TEXT: _('This field is required.'),
VALIDATION_MESSAGE_PASSWORDS_MATCH: _('The passwords must match.'),

SHOW_PASSWORD_MESSAGE: _('Show password'),
SHOW_SELECT_ORG_MESSAGE: _('Select an organisation from the list.'),
Expand Down