From a923fc7303a5b68761542821729ea485e9f8f554 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 18 Jan 2018 15:12:17 +0100 Subject: [PATCH] pull-requests: use proper validation of pull request title to prevent from bad errors. --- rhodecode/apps/repository/views/repo_pull_requests.py | 2 +- rhodecode/model/forms.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rhodecode/apps/repository/views/repo_pull_requests.py b/rhodecode/apps/repository/views/repo_pull_requests.py index e506213e..21da3466 100644 --- a/rhodecode/apps/repository/views/repo_pull_requests.py +++ b/rhodecode/apps/repository/views/repo_pull_requests.py @@ -743,7 +743,7 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView): if errors.error_dict.get('revisions'): msg = 'Revisions: %s' % errors.error_dict['revisions'] elif errors.error_dict.get('pullrequest_title'): - msg = _('Pull request requires a title with min. 3 chars') + msg = errors.error_dict.get('pullrequest_title') else: msg = _('Error creating pull request: {}').format(errors) log.exception(msg) diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py index db1c9eec..06f8a472 100644 --- a/rhodecode/model/forms.py +++ b/rhodecode/model/forms.py @@ -598,7 +598,7 @@ def PullRequestForm(localizer, repo_id): revisions = All(#v.NotReviewedRevisions(localizer, repo_id)(), v.UniqueList(localizer)(not_empty=True)) review_members = formencode.ForEach(ReviewerForm()) - pullrequest_title = v.UnicodeString(strip=True, required=True) + pullrequest_title = v.UnicodeString(strip=True, required=True, min=3, max=255) pullrequest_desc = v.UnicodeString(strip=True, required=False) return _PullRequestForm