scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-01 01:14:30 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixes user invitation button [fixes SCI-1726]

Browse source
This commit is contained in:
zmagod 2017-10-25 11:31:32 +02:00
parent be2c3b807f
commit c36fcb1fa4
5 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/client_api/users/invitations_controller.rb
View file

@ -11,6 +11,12 @@ module ClientApi
emails: params[:emails])
invite_results = invite_service.invitation
success_response(invite_results)
rescue => error
respond_to do |format|
format.json do
render json: { message: error }, status: :unprocessable_entity
end
end
end
private

42
app/javascript/src/components/InviteUsersModal/components/InviteUsersButton.jsx
View file

@ -9,26 +9,26 @@ type Props = {
status: boolean
};
const InviteUsersButton = ({
handleClick,
status
} : Props) => (
<DropdownButton
bsStyle={"primary"}
title={<FormattedMessage id="invite_users.dropdown_button.invite" />}
id="invite_users.submit_button"
disabled={status}
>
<MenuItem onClick={() => handleClick("guest")}>
<FormattedMessage id="invite_users.dropdown_button.guest" />
</MenuItem>
<MenuItem onClick={() => handleClick("normal_user")}>
<FormattedMessage id="invite_users.dropdown_button.normal_user" />
</MenuItem>
<MenuItem onClick={() => handleClick("admin")}>
<FormattedMessage id="invite_users.dropdown_button.admin" />
</MenuItem>
</DropdownButton>
);
const InviteUsersButton = ({ handleClick, status }: Props) => {
console.log(status);
return (
<DropdownButton
bsStyle={"primary"}
title={<FormattedMessage id="invite_users.dropdown_button.invite" />}
id="invite_users.submit_button"
disabled={status}
>
<MenuItem onClick={() => handleClick("guest")}>
<FormattedMessage id="invite_users.dropdown_button.guest" />
</MenuItem>
<MenuItem onClick={() => handleClick("normal_user")}>
<FormattedMessage id="invite_users.dropdown_button.normal_user" />
</MenuItem>
<MenuItem onClick={() => handleClick("admin")}>
<FormattedMessage id="invite_users.dropdown_button.admin" />
</MenuItem>
</DropdownButton>
);
};
export default InviteUsersButton;

3
app/javascript/src/components/InviteUsersModal/index.jsx
View file

@ -77,7 +77,8 @@ class InviteUsersModal extends Component<Props, State> {
.then(response => {
(this: any).setState({
inviteResults: response,
showInviteUsersResults: true
showInviteUsersResults: true,
inviteUserButtonDisabled: true
});
})
.catch(error => {

3
app/services/client_api/invitations_service.rb
View file

@ -11,7 +11,8 @@ module ClientApi
unless @role && UserTeam.roles.keys.include?(@role) &&
@emails && @emails.present?
raise ClientApi::CustomInvitationsError
raise ClientApi::CustomInvitationsError,
I18n.t('client_api.invalid_arguments')
end
@emails = @emails.map(&:downcase)
end

1
config/locales/en.yml
View file

@ -1817,6 +1817,7 @@ en:
by: 'by'
client_api:
invalid_arguments: "Invalid arguments"
generic_error_message: "Something went wrong! Please try again later."
user_teams:
leave_team_error: "An error occured."