-
Notifications
You must be signed in to change notification settings - Fork 1
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
Prevent user import if activation method is not selected #13
Conversation
…username if its empty before create new user. So not nessesary to have checkbox.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved, tested on 3d installations: faxe, fredericia, odsherred
includes/activation_form.inc
Outdated
@@ -103,8 +103,8 @@ function os2intra_user_import_activate_form_validate($form, &$form_state) { | |||
} | |||
|
|||
// Check if it matches the users birthday field | |||
$birthday_field = field_get_items('user', $user, 'field_os2intra_birthdate'); | |||
if ($input_birthday !== $birthday_field[0]['value']) { | |||
$birthday_field = field_get_items('user', $user, 'field_os2intra_birthday'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@andriyun
odsherred has this field called as field_os2intra_birthday, but fk and faxe have it as field_os2intra_birthdate.
which would mean that after this change it will only work on odsherred.
Is that the desired change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i can see we already have a mapping for that field in the settings with they key 'os2intra_user_import_birthday_field', how about using that instead of hardcoding the field?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch!
I'll fix fix
@stanbellcom fixed |
Fixes related to #12