FEATURE: allow API to mark accounts as approved on creation

This commit is contained in:
Sam
2017-08-28 15:36:46 -04:00
parent e282f10d94
commit 9f0f086b3e
2 changed files with 26 additions and 5 deletions

View File

@@ -318,6 +318,12 @@ class UsersController < ApplicationController
user = User.new(user_params)
end
# Handle API approval
if user.approved
user.approved_by_id ||= current_user.id
user.approved_at ||= Time.zone.now
end
# Handle custom fields
user_fields = UserField.all
if user_fields.present?
@@ -842,7 +848,7 @@ class UsersController < ApplicationController
current_user.present? &&
current_user.admin?
result.merge!(params.permit(:active, :staged))
result.merge!(params.permit(:active, :staged, :approved))
end
result