kallithea Changeset - b622e6849b67

Changeset - b622e6849b67

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 12 years ago 2013-06-12 12:23:20
madski@unity3d.com

Grafted from: 2dd44040a510

pull requests: give slightly more useful error messages on failing form validation

1 file changed with 2 insertions and 2 deletions:

rhodecode/controllers/pullrequests.py

0 comments (0 inline, 0 general)

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -313,28 +313,28 @@ class PullrequestsController(BaseRepoCon @@
                                    'repository.admin')
     def create(self, repo_name):
         repo = RepoModel()._get_repo(repo_name)
         try:
             _form = PullRequestForm(repo.repo_id)().to_python(request.POST)
         except formencode.Invalid, errors:
             log.error(traceback.format_exc())
             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')
             else:
                 msg = _('Error creating pull request')
+                msg = _('Error creating pull request: %s') % errors.msg
             h.flash(msg, 'error')
             return redirect(url('pullrequest_home', repo_name=repo_name))
+            return redirect(url('pullrequest_home', repo_name=repo_name)) ## would rather just go back to form ...
         org_repo = _form['org_repo']
         org_ref = _form['org_ref'] # will end with merge_rev but have symbolic name
         other_repo = _form['other_repo']
         other_ref = 'rev:ancestor:%s' % _form['ancestor_rev'] # could be calculated from other_ref ...
         revisions = [x for x in reversed(_form['revisions'])]
         reviewers = _form['review_members']
         title = _form['pullrequest_title']
         if not title:
             title = '%s#%s to %s' % (org_repo, org_ref.split(':', 2)[1], other_repo)
         description = _form['pullrequest_desc']

0 comments (0 inline, 0 general)