scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-11 01:44:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688

Browse source
This commit is contained in:
zmagod 2017-10-18 14:15:28 +02:00
commit d2c3827289
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/users/invitations_controller.rb
View file

@ -153,7 +153,7 @@ module Users
def update_sanitized_params
# Solution for Devise < 4.0.0
devise_parameter_sanitizer.for(:accept_invitation) << :full_name
devise_parameter_sanitizer.permit(:sign_up, keys: [:full_name])
end
def check_captcha

5
app/javascript/src/scenes/SettingsPage/scenes/teams/new/index.jsx
View file

@ -1,5 +1,6 @@
// @flow
import React, { Component } from "react";
import { connect } from "react-redux";
import {
Breadcrumb,
FormGroup,
@ -27,6 +28,7 @@ import {
NAME_MAX_LENGTH,
TEXT_MAX_LENGTH
} from "../../../../../config/constants/numeric";
import { getTeamsList } from "../../../../../components/actions/TeamsActions";
import { BORDER_LIGHT_COLOR } from "../../../../../config/constants/colors";
@ -95,6 +97,7 @@ class SettingsNewTeam extends Component<Props, State> {
createNewTeam(this.state.team)
.then(response => {
// Redirect to the new team page
this.props.getTeamsList();
(this: any).newState = { ...this.state };
(this: any).newState = update((this: any).newState, {
redirectTo: {
@ -287,4 +290,4 @@ class SettingsNewTeam extends Component<Props, State> {
}
}
export default SettingsNewTeam;
export default connect(null, { getTeamsList })(SettingsNewTeam);