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

Fixes #18015: Remove technique from technique tree when deleting technique in the technique editor #3132

Merged
merged 1 commit into from
Jul 21, 2020
Merged

Fixes #18015: Remove technique from technique tree when deleting technique in the technique editor #3132

merged 1 commit into from
Jul 21, 2020

Conversation

VinceMacBuche
Copy link
Member

@VinceMacBuche VinceMacBuche requested a review from fanf July 21, 2020 13:12
@VinceMacBuche
Copy link
Member Author

PR updated with a new commit

fanf
fanf requested changes Jul 21, 2020
View reviewed changes
webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueWriter.scala
@@ -149,6 +151,14 @@ class TechniqueWriter (
}

_ <- archiver.deleteTechnique(techniqueName,techniqueVersion, category.id.name.value, modId,committer, s"Deleting technique ${techniqueName}/${techniqueVersion}")
Copy link
Member

Choose a reason for hiding this comment

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

You need to first delete active technique, then on FS, because active technique deletion won't work if there's directives

Copy link
Member Author

Choose a reason for hiding this comment

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

we prevent it if there is directives, or if we force the deletion we delete directives first, but I'm ok with you we must do this before

@VinceMacBuche
Copy link
Member Author

PR updated with a new commit

@Normation-Quality-Assistant
Copy link
Contributor

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/rudder/pull/3132
-- Your faithful QA
Kant merge: "Happiness is not an ideal of reason, but of imagination."
(https://ci.normation.com/jenkins/job/merge-accepted-pr/27888/console)

@fanf
Copy link
Member

fanf commented Jul 21, 2020

OK, squash merging this PR

@fanf fanf force-pushed the bug_18015/remove_technique_from_technique_tree_when_deleting_technique_in_the_technique_editor branch from 732b047 to 7ab6409 Compare July 21, 2020 14:01
@fanf fanf merged commit 7ab6409 into Normation:branches/rudder/6.0 Jul 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fanf fanf fanf approved these changes

Assignees
No one assigned
Labels
qa: Can't merge
Projects
None yet
Milestone
No milestone
3 participants
@VinceMacBuche @Normation-Quality-Assistant @fanf