Fixing permissions checks for shadow assignment points in results table.

ReCodEx · Mar 12, 2022 · ff025c2 · ff025c2
1 parent 6367768
commit ff025c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/components/Groups/ResultsTable/ResultsTable.js b/src/components/Groups/ResultsTable/ResultsTable.js
@@ -337,7 +337,8 @@ class ResultsTable extends Component {
       /*
        * Shadow Assignments
        */
-      shadowAssignments.sort(compareShadowAssignments).forEach(shadowAssignment =>
+      shadowAssignments.sort(compareShadowAssignments).forEach(shadowAssignment => {
+        const isClickable = hasPermissions(shadowAssignment, 'createPoints', 'updatePoints', 'removePoints');
         columns.push(
           new SortableTableColumnDescriptor(
             shadowAssignment.id,
@@ -355,12 +356,12 @@ class ResultsTable extends Component {
               headerSuffix: shadowAssignment.maxPoints,
               headerSuffixClassName: styles.maxPointsRow,
               cellRenderer: shadowAssignmentCellRendererCreator(shadowAssignments, locale),
-              isClickable: true,
-              onClick: (userId, shadowId) => this.openDialogShadowAssignment(userId, shadowId),
+              isClickable,
+              onClick: isClickable ? (userId, shadowId) => this.openDialogShadowAssignment(userId, shadowId) : null,
             }
           )
-        )
-      );
+        );
+      });
 
       /*
        * Total points and optionally buttons

diff --git a/src/components/forms/EditShadowAssignmentPointsForm/EditShadowAssignmentPointsForm.js b/src/components/forms/EditShadowAssignmentPointsForm/EditShadowAssignmentPointsForm.js
@@ -126,7 +126,7 @@ const EditShadowAssignmentPointsForm = ({
         />
 
         {onRemovePoints && (
-          <Button onClick={onRemovePoints} variant="danger" className="em-margin-left">
+          <Button onClick={onRemovePoints} variant="danger">
             <DeleteIcon gapRight />
             <FormattedMessage
               id="app.editShadowAssignmentPointsForm.removePoints"