Skip to content

Commit

Permalink
Fixed pretty_url error on user creation
Browse files Browse the repository at this point in the history
  • Loading branch information
nebirhos committed May 28, 2012
1 parent 26f4d62 commit 125b0c9
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions app/controllers/admin/users_controller.rb
Expand Up @@ -26,7 +26,11 @@ def create
@admin_editing_language = admin_editing_language @admin_editing_language = admin_editing_language
@user = User.new(params[:user]) @user = User.new(params[:user])
@user.set_roles(params[:user][:role_ids]) @user.set_roles(params[:user][:role_ids])
@user.pretty_url = @user.pretty_url.urlify.blank? ? "#{@user.firstname}-#{@user.lastname}".urlify : @user.pretty_url.urlify if @user.pretty_url and @user.pretty_url.urlify.present?
@user.pretty_url = @user.pretty_url.urlify
else
@user.pretty_url = "#{@user.firstname}-#{@user.lastname}".urlify
end
if @user && @user.save && @user.errors.empty? if @user && @user.save && @user.errors.empty?
params[:user][:enabled] == '1' ? @user.enable! : @user.disable! params[:user][:enabled] == '1' ? @user.enable! : @user.disable!
redirect_to admin_users_path redirect_to admin_users_path
Expand All @@ -50,7 +54,11 @@ def update
end end
@user.set_roles(params[:user][:role_ids]) @user.set_roles(params[:user][:role_ids])
@user.attributes = params[:user] unless @user.blank? @user.attributes = params[:user] unless @user.blank?
@user.pretty_url = @user.pretty_url.urlify.blank? ? "#{@user.firstname}-#{@user.lastname}".urlify : @user.pretty_url.urlify if @user.pretty_url and @user.pretty_url.urlify.present?
@user.pretty_url = @user.pretty_url.urlify
else
@user.pretty_url = "#{@user.firstname}-#{@user.lastname}".urlify
end
if @user && @user.save && @user.errors.empty? if @user && @user.save && @user.errors.empty?
params[:user][:enabled] == '1' ? @user.enable! : @user.disable! params[:user][:enabled] == '1' ? @user.enable! : @user.disable!
params[:save_and_close] ? (redirect_to admin_users_path()) : (render :action => "edit") params[:save_and_close] ? (redirect_to admin_users_path()) : (render :action => "edit")
Expand Down

0 comments on commit 125b0c9

Please sign in to comment.