Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: user fields in invite signups were broken

This commit is contained in:
Régis Hanol 2017-10-04 23:04:24 +02:00
parent cf4e6e2f5b
commit 4771b0a99f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/invites-show.js.es6
View File

@ -61,7 +61,7 @@ export default Ember.Controller.extend(PasswordValidation, UsernameValidation, N
username: this.get('accountUsername'), username: this.get('accountUsername'),
name: this.get('accountName'), name: this.get('accountName'),
password: this.get('accountPassword'), password: this.get('accountPassword'),
userCustomFields user_custom_fields: userCustomFields
} }
}).then(result => { }).then(result => {
if (result.success) { if (result.success) {

2
app/controllers/invites_controller.rb
View File

@ -31,7 +31,7 @@ class InvitesController < ApplicationController
def perform_accept_invitation def perform_accept_invitation
params.require(:id) params.require(:id)
params.permit(:username, :name, :password, :user_custom_fields) params.permit(:username, :name, :password, user_custom_fields: {})
invite = Invite.find_by(invite_key: params[:id]) invite = Invite.find_by(invite_key: params[:id])
if invite.present? if invite.present?