Skip to content

Convert Ui-Login Package to Js - #6561

Merged
engelgabriel merged 8 commits into
developfrom
convert-login-to-js
Apr 3, 2017
Merged

engelgabriel merged 8 commits into
developfrom
convert-login-to-js

Conversation

@MartinSchoeler

Copy link
Copy Markdown
Member

@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
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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