Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Do not persist the internal state when the editor is closed

Kabiru Mwenja8da4818eed5b
diff --git a/app/forms/work_packages/activities_tab/journals/internal_note_form.rb b/app/forms/work_packages/activities_tab/journals/internal_note_form.rb
index 46f778408b2..54dc9c45fce 100644
--- a/app/forms/work_packages/activities_tab/journals/internal_note_form.rb
+++ b/app/forms/work_packages/activities_tab/journals/internal_note_form.rb
@@ -36,7 +36,7 @@ module WorkPackages::ActivitiesTab::Journals
checked: false,
data: {
"work-packages--activities-tab--internal-comment-target": "internalCheckbox",
- action: "input->work-packages--activities-tab--internal-comment#toggleInternal"
+ action: "input->work-packages--activities-tab--internal-comment#updateInternalState"
}
)
end
diff --git a/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/internal-comment.controller.ts b/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/internal-comment.controller.ts
index a16e2e9220b..8f05edeb975 100644
--- a/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/internal-comment.controller.ts
+++ b/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/internal-comment.controller.ts
@@ -65,14 +65,19 @@ export default class InternalCommentController extends BaseController {
}
onSubmitEnd(_event:CustomEvent):void {
- if (this.hasInternalCheckboxTarget) {
- this.toggleInternal();
- }
+ this.updateInternalState({ persist: false });
}
- toggleInternal():void {
+ updateInternalState({ persist = true } = {}):void {
+ if (!this.hasInternalCheckboxTarget) return;
+
const isChecked = this.internalCheckboxTarget.checked;
- this.setInternalStateWithPersistence(isChecked);
+
+ if (persist) {
+ this.setInternalStateWithPersistence(isChecked);
+ } else {
+ this.setInternalStateWithoutPersistence(isChecked);
+ }
if (isChecked) {
void this.sanitizeInternalMentions();
diff --git a/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/quote-comment.controller.ts b/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/quote-comment.controller.ts
index 93a502a702a..8e9e4c97ab9 100644
--- a/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/quote-comment.controller.ts
+++ b/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/quote-comment.controller.ts
@@ -83,7 +83,7 @@ export default class QuoteCommentController extends Controller {
private setCommentRestriction(isInternal:boolean) {
if (isInternal && !this.workPackagesActivitiesTabInternalCommentOutlet.internalCheckboxTarget.checked) {
this.workPackagesActivitiesTabInternalCommentOutlet.internalCheckboxTarget.checked = isInternal;
- this.workPackagesActivitiesTabInternalCommentOutlet.toggleInternal();
+ this.workPackagesActivitiesTabInternalCommentOutlet.updateInternalState();
}
}