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.

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

Convert Ui-Login Package to Js #6561

Merged
merged 8 commits into from
Apr 3, 2017
Merged

Convert Ui-Login Package to Js #6561

merged 8 commits into from
Apr 3, 2017

Conversation

MartinSchoeler
Copy link
Contributor

@RocketChat/core

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-6561 April 1, 2017 17:20 Inactive
if (customFields[field]) {
const customField = customFields[field];
if (customField.required === true && !value) {
return validationObj[field] = t('Field_required');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This return should return to function validateCustomFields


Template.loginServices.events({
'click .external-login'(e) {
if (this.service && this.service.service == null) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if (this.service == null || this.service.service == null) {

for (const field in formObj) {
if (formObj.hasOwnProperty(field)) {
const value = formObj[field];
if (customFields[field]) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you inverted this condition, the correct is if (customFields[field] == null) {

@rodrigok rodrigok added this to the 0.55.0 milestone Apr 3, 2017
@engelgabriel engelgabriel merged commit ddb6428 into develop Apr 3, 2017
@engelgabriel engelgabriel deleted the convert-login-to-js branch April 3, 2017 22:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants