changeset 2796:bf3c976d02ec beta

always post text about status changes of code-review
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 04 Sep 2012 00:34:39 +0200
parents 456a5190f1cc
children c9baaacb670a
files docs/changelog.rst rhodecode/controllers/changeset.py rhodecode/controllers/pullrequests.py
diffstat 3 files changed, 27 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/docs/changelog.rst	Tue Sep 04 00:27:31 2012 +0200
+++ b/docs/changelog.rst	Tue Sep 04 00:34:39 2012 +0200
@@ -4,7 +4,8 @@
 Changelog
 =========
 
-1.4.0 (**2012-XX-XX**)
+
+1.4.1 (**2012-XX-XX**)
 ----------------------
 
 :status: in-progress
@@ -12,6 +13,21 @@
 
 news
 ++++
+
+- always put a comment about code-review status change even if user send
+  empty data 
+
+fixes
++++++
+
+- fixed migrations of permissions that can lead to inconsistency issue
+
+
+1.4.0 (**2012-09-03**)
+----------------------
+
+news
+++++
  
 - new codereview system
 - email map, allowing users to have multiple email addresses mapped into
--- a/rhodecode/controllers/changeset.py	Tue Sep 04 00:27:31 2012 +0200
+++ b/rhodecode/controllers/changeset.py	Tue Sep 04 00:34:39 2012 +0200
@@ -376,9 +376,13 @@
     def comment(self, repo_name, revision):
         status = request.POST.get('changeset_status')
         change_status = request.POST.get('change_changeset_status')
+        text = request.POST.get('text')
+        if status and change_status:
+            text = text or (_('Status change -> %s')
+                            % ChangesetStatus.get_status_lbl(status))
 
         comm = ChangesetCommentsModel().create(
-            text=request.POST.get('text'),
+            text=text,
             repo=c.rhodecode_db_repo.repo_id,
             user=c.rhodecode_user.user_id,
             revision=revision,
--- a/rhodecode/controllers/pullrequests.py	Tue Sep 04 00:27:31 2012 +0200
+++ b/rhodecode/controllers/pullrequests.py	Tue Sep 04 00:34:39 2012 +0200
@@ -339,9 +339,12 @@
 
         status = request.POST.get('changeset_status')
         change_status = request.POST.get('change_changeset_status')
-
+        text = request.POST.get('text')
+        if status and change_status:
+            text = text or (_('Status change -> %s')
+                            % ChangesetStatus.get_status_lbl(status))
         comm = ChangesetCommentsModel().create(
-            text=request.POST.get('text'),
+            text=text,
             repo=c.rhodecode_db_repo.repo_id,
             user=c.rhodecode_user.user_id,
             pull_request=pull_request_id,