diff --git a/src/components/Assignments/SolutionsTable/SolutionsTableRow.js b/src/components/Assignments/SolutionsTable/SolutionsTableRow.js
index 319bbfd6e..edd604da6 100644
--- a/src/components/Assignments/SolutionsTable/SolutionsTableRow.js
+++ b/src/components/Assignments/SolutionsTable/SolutionsTableRow.js
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { FormattedMessage, FormattedNumber } from 'react-intl';
+import { FormattedMessage, FormattedNumber, injectIntl, intlShape } from 'react-intl';
import { Link } from 'react-router';
import { OverlayTrigger, Tooltip } from 'react-bootstrap';
import classnames from 'classnames';
@@ -9,6 +9,8 @@ import AssignmentStatusIcon, { getStatusDesc } from '../Assignment/AssignmentSta
import Points from './Points';
import EnvironmentsListItem from '../../helpers/EnvironmentsList/EnvironmentsListItem';
import DeleteSolutionButtonContainer from '../../../containers/DeleteSolutionButtonContainer/DeleteSolutionButtonContainer';
+import AcceptSolutionContainer from '../../../containers/AcceptSolutionContainer';
+
import CommentsIcon from './CommentsIcon';
import { SendIcon } from '../../icons';
import DateTime from '../../widgets/DateTime';
@@ -36,6 +38,7 @@ const SolutionsTableRow = ({
noteMaxlen = null,
compact = false,
links: { SOLUTION_DETAIL_URI_FACTORY },
+ intl: { locale },
}) => {
const trimmedNote = note && note.trim();
const hasNote = Boolean(trimmedNote);
@@ -118,6 +121,9 @@ const SolutionsTableRow = ({
)}
+ {permissionHints && permissionHints.setAccepted && (
+
+ )}
{permissionHints && permissionHints.delete && }
@@ -162,6 +168,7 @@ SolutionsTableRow.propTypes = {
noteMaxlen: PropTypes.number,
compact: PropTypes.bool.isRequired,
links: PropTypes.object,
+ intl: intlShape,
};
-export default withLinks(SolutionsTableRow);
+export default withLinks(injectIntl(SolutionsTableRow));
diff --git a/src/components/buttons/AcceptSolution/AcceptSolution.js b/src/components/buttons/AcceptSolution/AcceptSolution.js
index df8664b19..ddd81fe92 100644
--- a/src/components/buttons/AcceptSolution/AcceptSolution.js
+++ b/src/components/buttons/AcceptSolution/AcceptSolution.js
@@ -4,16 +4,24 @@ import { FormattedMessage } from 'react-intl';
import Button from '../../widgets/FlatButton';
import Icon from '../../icons';
-const AcceptSolution = ({ accepted, acceptPending, accept, unaccept }) =>
+const AcceptSolution = ({ accepted, acceptPending, accept, unaccept, shortLabel = false, bsSize = undefined }) =>
accepted === true ? (
-