Merge pull request #182 from ReCodEx/assign-all

Assign exercise in more groups & other stuff

src/components/forms/EditGroupForm/EditGroupForm.js

@@ -21,7 +21,8 @@ const EditGroupForm = ({
   hasThreshold,
   collapsable = false,
   isOpen = true,
-  reset
+  reset,
+  isSuperAdmin
 }) =>
   <FormBox
     title={
@@ -91,18 +92,19 @@ const EditGroupForm = ({
       isGroup={true}
     />
 
-    <Field
-      name="externalId"
-      tabIndex={2}
-      component={TextField}
-      required
-      label={
-        <FormattedMessage
-          id="app.createGroup.externalId"
-          defaultMessage="External ID of the group (e. g. ID of the group in the school IS):"
-        />
-      }
-    />
+    {isSuperAdmin &&
+      <Field
+        name="externalId"
+        tabIndex={2}
+        component={TextField}
+        required
+        label={
+          <FormattedMessage
+            id="app.createGroup.externalId"
+            defaultMessage="External ID of the group (e. g. ID of the group in the school IS):"
+          />
+        }
+      />}
     <Row>
       <Col lg={6}>
         <Field
@@ -182,7 +184,8 @@ EditGroupForm.propTypes = {
   createNew: PropTypes.bool,
   collapsable: PropTypes.bool,
   isOpen: PropTypes.bool,
-  reset: PropTypes.func
+  reset: PropTypes.func,
+  isSuperAdmin: PropTypes.bool
 };
 
 const validate = ({ localizedTexts = [], hasThreshold, threshold }) => {

src/components/forms/ForkExerciseForm/ForkExerciseForm.css

@@ -1,4 +1,4 @@
-.formSpace {
-  padding-left: 10px;
+.forkForm {
+  padding-left: 0px;
   display: flex;
 }

src/components/forms/ForkExerciseForm/ForkExerciseForm.js

@@ -13,7 +13,7 @@ import { SuccessIcon } from '../../../components/icons';
 import { forkStatuses } from '../../../redux/modules/exercises';
 import { getFork } from '../../../redux/selectors/exercises';
 import ResourceRenderer from '../../helpers/ResourceRenderer';
-import { getLocalizedName } from '../../../helpers/getLocalizedData';
+import { getGroupCanonicalLocalizedName } from '../../../helpers/getLocalizedData';
 
 import withLinks from '../../../helpers/withLinks';
 
@@ -41,6 +41,7 @@ class ForkExerciseForm extends Component {
       submitSucceeded,
       invalid,
       groups,
+      groupsAccessor,
       intl: { locale }
     } = this.props;
 
@@ -70,7 +71,7 @@ class ForkExerciseForm extends Component {
                   defaultMessage="Saving failed. Please try again later."
                 />
               </Alert>}
-            <Form inline className="formSpace">
+            <Form inline className="forkForm">
               <ResourceRenderer resource={groups.toArray()}>
                 {(...groups) =>
                   <Field
@@ -79,12 +80,15 @@ class ForkExerciseForm extends Component {
                     label={''}
                     options={[{ key: '', name: '_Public_' }].concat(
                       groups
-                        .sort((a, b) => a.name.localeCompare(b.name, locale))
-                        .filter((item, pos, arr) => arr.indexOf(item) === pos)
                         .map(group => ({
                           key: group.id,
-                          name: getLocalizedName(group, locale)
+                          name: getGroupCanonicalLocalizedName(
+                            group,
+                            groupsAccessor,
+                            locale
+                          )
                         }))
+                        .sort((a, b) => a.name.localeCompare(b.name, locale))
                     )}
                   />}
               </ResourceRenderer>
@@ -140,6 +144,7 @@ ForkExerciseForm.propTypes = {
   push: PropTypes.func.isRequired,
   links: PropTypes.object,
   groups: ImmutablePropTypes.map,
+  groupsAccessor: PropTypes.func.isRequired,
   intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };