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

Programming exercises: Fix missing branch configuration #7189

Merged
merged 6 commits into from
Sep 14, 2023
Merged

Programming exercises: Fix missing branch configuration #7189

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e93b317
Add missing branch attribute to programming-exercise.model.ts
Sep 13, 2023
3b3fab9
improve log message
Sep 13, 2023
0794d2b
Revert "improve log message"
julian-christl Sep 13, 2023
85ce04c
Revert "Add missing branch attribute to programming-exercise.model.ts"
julian-christl Sep 13, 2023
6a1e73a
ignore changes to the default branch on update
julian-christl Sep 13, 2023
65bf224
Merge branch 'develop' into bugfix/programming-exercises/missing-branch
julian-christl Sep 13, 2023
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
3 changes: 3 additions & 0 deletions src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,9 @@ public ResponseEntity<ProgrammingExercise> updateProgrammingExercise(@RequestBod
// Forbid conversion between normal course exercise and exam exercise
exerciseService.checkForConversionBetweenExamAndCourseExercise(updatedProgrammingExercise, programmingExerciseBeforeUpdate, ENTITY_NAME);

// Ignore changes to the default branch
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this still a temporal solution or will is stay here for good?

updatedProgrammingExercise.setBranch(programmingExerciseBeforeUpdate.getBranch());

if (updatedProgrammingExercise.getAuxiliaryRepositories() == null) {
// make sure the default value is set properly
updatedProgrammingExercise.setAuxiliaryRepositories(new ArrayList<>());
Expand Down
Loading