Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Another set of fixes #130

Merged
merged 6 commits into from
Nov 3, 2017
Merged

Another set of fixes #130

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ef38100
Show all parent groups on more pages
SemaiCZE Nov 3, 2017
dcd41b1
Translate SIS course names
SemaiCZE Nov 3, 2017
4d55392
Forking exercise to selected group, now disabled
SemaiCZE Nov 3, 2017
4b61cee
Fix pipeline page layout
SemaiCZE Nov 3, 2017
8f84342
Merge branch 'master' into fixes
SemaiCZE Nov 3, 2017
96f63ea
Completely hide forking exercise for now
SemaiCZE Nov 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/components/Groups/HierarchyLine/HierarchyLine.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,8 @@
border-color: #f5f5f5;
color: grey;
}

.slashStyle {
margin: 0 5px;
color: #aaa;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Much better.

2 changes: 1 addition & 1 deletion src/components/Groups/HierarchyLine/HierarchyLine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const HierarchyLine = ({ groupId, parentGroupsIds }) =>
i !== 0 &&
<span key={i}>
<GroupsNameContainer groupId={groupId} />{' '}
<span style={{ margin: '0 5px', color: '#aaa' }}>/</span>
<span className="slashStyle">/</span>
</span>
)}
<GroupsNameContainer groupId={groupId} noLink />
Expand Down
2 changes: 0 additions & 2 deletions src/components/forms/ForkExerciseForm/ForkExerciseForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ class ForkExerciseForm extends Component {
name: group.name
}))
)}
disabled
/>}
</ResourceRenderer>

Expand Down Expand Up @@ -120,7 +119,6 @@ class ForkExerciseForm extends Component {
/>
)
}}
disabled
/>
</Form>
</div>
Expand Down
17 changes: 9 additions & 8 deletions src/pages/Exercise/Exercise.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
} from '../../components/icons';
import Confirm from '../../components/forms/Confirm';
import PipelinesSimpleList from '../../components/Pipelines/PipelinesSimpleList';
import ForkExerciseForm from '../../components/forms/ForkExerciseForm';
// import ForkExerciseForm from '../../components/forms/ForkExerciseForm';
import AssignExerciseButton from '../../components/buttons/AssignExerciseButton';

import { isSubmitting } from '../../redux/selectors/submission';
Expand Down Expand Up @@ -139,12 +139,12 @@ class Exercise extends Component {
initCreateReferenceSolution,
exercisePipelines,
deleteReferenceSolution,
push,
groups,
forkExercise
push
// groups,
// forkExercise
} = this.props;

const { forkId } = this.state;
// const { forkId } = this.state;

const {
links: {
Expand Down Expand Up @@ -219,12 +219,12 @@ class Exercise extends Component {
/>
</Button>
</LinkContainer>
<ForkExerciseForm
{/* <ForkExerciseForm
exerciseId={exercise.id}
groups={groups}
forkId={forkId}
onSubmit={formData => forkExercise(forkId, formData)}
/>
/> */}
</ButtonGroup>
</div>}
<p />
Expand Down Expand Up @@ -481,7 +481,8 @@ export default withLinks(
};
},
(dispatch, { params: { exerciseId } }) => ({
loadAsync: userId => Exercise.loadAsync({ exerciseId }, dispatch, userId),
loadAsync: userId =>
Exercise.loadAsync({ exerciseId }, dispatch, userId),
assignExercise: groupId =>
dispatch(assignExercise(groupId, exerciseId)),
push: url => dispatch(push(url)),
Expand Down