Skip to content
Snippets Groups Projects
Commit cfd76d49 authored by m431m's avatar m431m :speech_balloon:
Browse files

Resolves issues:


* REDMINE_ISSUE-12482 | Fix error message display on forgotten password
* Add update .gitlab-ci.yml with VUE_APP_TITLE

Co-authored-by: default avatarFlorent <florent@Air-de-neogeo.neogeo.local>
parent c4b88754
No related branches found
No related tags found
No related merge requests found
Pipeline #5146 passed
......@@ -41,6 +41,7 @@ build_development:
BASE_PATH=/\n
VUE_APP_NEXT_DEFAULT=/\n
VUE_APP_BASE_PATH=${BASE_PATH}\n
VUE_APP_TITLE=Login - Pigma\n
VUE_APP_FAVICON_URL=${VUE_APP_DOMAIN}/assets/favicon.png\n
VUE_APP_LOGIN_API_PATH=/fr/login/\n
VUE_APP_ORGANISATION_API_PATH=/fr/organisation/\n
......
......@@ -20,6 +20,9 @@ VUE_APP_NEXT_DEFAULT=/
VUE_APP_BASE_PATH=${BASE_PATH}
# App title
VUE_APP_TITLE=Login - PIGMA
# Favicon
VUE_APP_FAVICON_URL=${VUE_APP_DOMAIN}/assets/favicon.png
......
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= VUE_APP_FAVICON_URL %>">
<link rel="stylesheet" href="https://unpkg.com/vue-multiselect@2.1.0/dist/vue-multiselect.min.css">
<title><%= htmlWebpackPlugin.options.title %></title>
<title><%= VUE_APP_TITLE %></title>
</head>
<body>
<noscript>
......
......@@ -133,6 +133,7 @@ label.required:after {
}
}
.toast {
min-width: 250px;
max-width: 600px;
font-size: 1rem;
}
......
......@@ -23,7 +23,11 @@ export class ErrorService {
}
}
}
recurse(errorObj);
if (typeof errorObj === 'object') {
recurse(errorObj);
} else if (typeof errorObj === 'string') {
messages.push(`<li>${errorObj}</li>`);
}
// Toastr option for error messages
toastr.options = {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment