-
Notifications
You must be signed in to change notification settings - Fork 2
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.
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
173 moderator and editor can release a bundle during the creation #182
Open
schluebbo
wants to merge
13
commits into
v3.2.1
Choose a base branch
from
173-moderator-and-editor-can-release-a-bundle-during-the-creation
base: v3.2.1
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
173 moderator and editor can release a bundle during the creation #182
schluebbo
wants to merge
13
commits into
v3.2.1
from
173-moderator-and-editor-can-release-a-bundle-during-the-creation
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Force `isPublished = false` for non-admins in `editBundle()` - Hide "Release" checkbox in UI for non-admins
- Ensure `QuestionnaireGroupDTO` is set when reassigning questionnaires - Prevents assigned questionnaires from becoming unmovable after errors
- Replaced direct `bundleDao` call in `BundleController` with `BundleService.isBundleModifiable()`
- Extracted text cleanup logic into `BundleService.cleanUpTextFields()` - Moved removal of unassigned bundle questionnaires to `BundleService.removeUnassignedBundleQuestionnaires()` - Introduced `BundleService.prepareBundleForEdit()` to centralize pre-processing logic
- Ensure `hasScores` is restored in `BundleController` after a validation error - Prevents the score activation button from disappearing in the UI
…e redundant method - Replaced `getAvailableQuestionnaires` in `BundleController` with the existing method from `BundleService` - Adjusted returned list from an immutable to a mutable list for modifications - Removed unused `getAvailableQuestionnaires` method from `BundleController` as it is no longer needed
…o BundleService - Extracted logic for synchronizing assigned and available questionnaires into `syncAssignedAndAvailableQuestionnaires` in `BundleService` - Ensured `exportTemplates`, `questionnaireGroupDTO`, and `hasScores` are properly updated in assigned questionnaires
- Moved `saveOrUpdateBundle` logic from `BundleController` to `BundleService` - Removed redundant dependencies from `BundleController` that are now handled by `BundleService`
- Moved bundle property assignment into a new method `updateBundleProperties` - Simplified bundle initialization by using a conditional expression
- Moved ACL entry creation to `createAclEntry` for better code organization - Extracted bundle questionnaire cleanup logic into `cleanupRemovedBundleQuestionnaires`
…Questionnaires` - Moved bundle questionnaire persistence into a separate method for better readability. - Simplified `saveOrUpdateBundle` by handling `isPublished` logic separately.
- Extracted `getBundleDTO` from `BundleController` to `BundleService`.
Test Results:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Restricted
isPublished
to admins, ensured validation error persistence, and refactored bundle-related logic intoBundleService
.Key Changes:
isPublished
to admins in the backend and frontend.hasScores
andQuestionnaireGroupDTO
persist after validation errors.getBundleDTO
,saveOrUpdateBundle
, and related logic toBundleService
.