Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 23:56:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for display of multiple sign up errors

Browse source
This commit is contained in:
Stephen Birarda 2016-12-08 16:28:16 -08:00
parent b66ddbdbdb
commit 9445fc2898
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/qml/LoginDialog/SignUpBody.qml
View file

@ -63,12 +63,10 @@ Item {
visible: false visible: false
text: qsTr("Username or password incorrect.") text: qsTr("There was an unknown error while creating your account.")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: hifi.colors.redAccent color: hifi.colors.redAccent
lineHeight: 1 horizontalAlignment: Text.AlignLeft
lineHeightMode: Text.ProportionalHeight
horizontalAlignment: Text.AlignHCenter
} }
Column { Column {

2
interface/src/ui/LoginDialog.cpp
View file

@ -225,7 +225,7 @@ void LoginDialog::signupFailed(QNetworkReply& reply) {
errorStringList.append(QString("Password %1.").arg(errorStringFromAPIObject(dataObject[PASSWORD_DATA_KEY]))); errorStringList.append(QString("Password %1.").arg(errorStringFromAPIObject(dataObject[PASSWORD_DATA_KEY])));
} }
emit handleSignupFailed(errorStringList.join(' ')); emit handleSignupFailed(errorStringList.join('\n'));
} else { } else {
static const QString DEFAULT_SIGN_UP_FAILURE_MESSAGE = "There was an unknown error while creating your account. Please try again later."; static const QString DEFAULT_SIGN_UP_FAILURE_MESSAGE = "There was an unknown error while creating your account. Please try again later.";
emit handleSignupFailed(DEFAULT_SIGN_UP_FAILURE_MESSAGE); emit handleSignupFailed(DEFAULT_SIGN_UP_FAILURE_MESSAGE);