mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-11-10 00:11:22 +08:00
fixes user invitation button [fixes SCI-1726]
This commit is contained in:
parent
be2c3b807f
commit
c36fcb1fa4
5 changed files with 32 additions and 23 deletions
|
|
@ -11,6 +11,12 @@ module ClientApi
|
||||||
emails: params[:emails])
|
emails: params[:emails])
|
||||||
invite_results = invite_service.invitation
|
invite_results = invite_service.invitation
|
||||||
success_response(invite_results)
|
success_response(invite_results)
|
||||||
|
rescue => error
|
||||||
|
respond_to do |format|
|
||||||
|
format.json do
|
||||||
|
render json: { message: error }, status: :unprocessable_entity
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,9 @@ type Props = {
|
||||||
status: boolean
|
status: boolean
|
||||||
};
|
};
|
||||||
|
|
||||||
const InviteUsersButton = ({
|
const InviteUsersButton = ({ handleClick, status }: Props) => {
|
||||||
handleClick,
|
console.log(status);
|
||||||
status
|
return (
|
||||||
} : Props) => (
|
|
||||||
<DropdownButton
|
<DropdownButton
|
||||||
bsStyle={"primary"}
|
bsStyle={"primary"}
|
||||||
title={<FormattedMessage id="invite_users.dropdown_button.invite" />}
|
title={<FormattedMessage id="invite_users.dropdown_button.invite" />}
|
||||||
|
|
@ -30,5 +29,6 @@ const InviteUsersButton = ({
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
</DropdownButton>
|
</DropdownButton>
|
||||||
);
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export default InviteUsersButton;
|
export default InviteUsersButton;
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,8 @@ class InviteUsersModal extends Component<Props, State> {
|
||||||
.then(response => {
|
.then(response => {
|
||||||
(this: any).setState({
|
(this: any).setState({
|
||||||
inviteResults: response,
|
inviteResults: response,
|
||||||
showInviteUsersResults: true
|
showInviteUsersResults: true,
|
||||||
|
inviteUserButtonDisabled: true
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,8 @@ module ClientApi
|
||||||
|
|
||||||
unless @role && UserTeam.roles.keys.include?(@role) &&
|
unless @role && UserTeam.roles.keys.include?(@role) &&
|
||||||
@emails && @emails.present?
|
@emails && @emails.present?
|
||||||
raise ClientApi::CustomInvitationsError
|
raise ClientApi::CustomInvitationsError,
|
||||||
|
I18n.t('client_api.invalid_arguments')
|
||||||
end
|
end
|
||||||
@emails = @emails.map(&:downcase)
|
@emails = @emails.map(&:downcase)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1817,6 +1817,7 @@ en:
|
||||||
by: 'by'
|
by: 'by'
|
||||||
|
|
||||||
client_api:
|
client_api:
|
||||||
|
invalid_arguments: "Invalid arguments"
|
||||||
generic_error_message: "Something went wrong! Please try again later."
|
generic_error_message: "Something went wrong! Please try again later."
|
||||||
user_teams:
|
user_teams:
|
||||||
leave_team_error: "An error occured."
|
leave_team_error: "An error occured."
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue