From 0b67a513d6c2fb4929bea28517a755e0c5d8ae0b Mon Sep 17 00:00:00 2001
From: Hugues Delorme <delorme.hugues@fougsys.fr>
Date: Tue, 22 Nov 2011 15:04:58 +0100
Subject: [PATCH] Utils: let SubmitEditorWidget handle empty description
SubmitEditorWidget::canSubmit() now return false if the description
field is empty. This avoids dummy code duplication in VCS plugins.
Change-Id: I11e4928e8eed432ccee6fa1f3516f0179a54625c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
---
src/libs/utils/submiteditorwidget.cpp | 2 ++
src/plugins/git/gitsubmiteditorwidget.cpp | 5 +----
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/libs/utils/submiteditorwidget.cpp b/src/libs/utils/submiteditorwidget.cpp
index 44aeaa967ff..d76a1f165ae 100644
--- a/src/libs/utils/submiteditorwidget.cpp
+++ b/src/libs/utils/submiteditorwidget.cpp
@@ -578,6 +578,8 @@ void SubmitEditorWidget::insertTopWidget(QWidget *w)
bool SubmitEditorWidget::canSubmit() const
{
+ if (cleanupDescription(descriptionText()).trimmed().isEmpty())
+ return false;
const unsigned checkedCount = checkedFilesCount();
return d->m_emptyFileListEnabled || checkedCount > 0;
}
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index 6223a4b4cfe..2c09d758777 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -154,11 +154,8 @@ void GitSubmitEditorWidget::setPanelData(const GitSubmitEditorPanelData &data)
bool GitSubmitEditorWidget::canSubmit() const
{
- QString message = cleanupDescription(descriptionText()).trimmed();
-
if (m_gitSubmitPanelUi.invalidAuthorLabel->isVisible()
- || m_gitSubmitPanelUi.invalidEmailLabel->isVisible()
- || message.isEmpty())
+ || m_gitSubmitPanelUi.invalidEmailLabel->isVisible())
return false;
return SubmitEditorWidget::canSubmit();
}
--
GitLab