Browse Source

Refactor assignable roles

pull/463/head
baarkerlounger 3 years ago
parent
commit
0e9953534e
  1. 5
      app/controllers/users_controller.rb

5
app/controllers/users_controller.rb

@ -34,12 +34,11 @@ class UsersController < ApplicationController
@resource.errors.add :email, I18n.t("validations.email.blank") @resource.errors.add :email, I18n.t("validations.email.blank")
elsif !email_valid?(user_params["email"]) elsif !email_valid?(user_params["email"])
@resource.errors.add :email, I18n.t("validations.email.invalid") @resource.errors.add :email, I18n.t("validations.email.invalid")
elsif user_params[:role] && !current_user.assignable_roles.key?(user_params[:role].to_sym)
@resource.errors.add :role, I18n.t("validations.role.invalid")
end end
if @resource.errors.present? if @resource.errors.present?
render :new, status: :unprocessable_entity render :new, status: :unprocessable_entity
elsif user_params[:role] == "support" && !current_user.support?
@resource.errors.add :role, I18n.t("validations.role.invalid")
render :new, status: :unprocessable_entity
else else
user = User.create(user_params.merge(org_params).merge(password_params)) user = User.create(user_params.merge(org_params).merge(password_params))
if user.persisted? if user.persisted?

Loading…
Cancel
Save