From 4c2e5ee6600ffa71ceb1f741a1eaeea4832a97d8 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 27 Mar 2017 15:32:27 +0200
Subject: [PATCH] pull-request: lock button when updating reviewers to forbid
 multi-submit.

- fixed some small UI issues found.
---
 rhodecode/model/pull_request.py                    | 14 ++++++++------
 rhodecode/public/css/main.less                     |  7 -------
 rhodecode/public/js/src/rhodecode/pullrequests.js  |  7 ++++---
 .../templates/pullrequests/pullrequest_show.mako   |  5 ++++-
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index 1644f523..7a552d11 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -886,20 +886,22 @@ class PullRequestModel(BaseModel):
             reviewer = PullRequestReviewers(_usr, pull_request, reasons)
             Session().add(reviewer)
 
-        self.notify_reviewers(pull_request, ids_to_add)
-
         for uid in ids_to_remove:
             changed = True
-            reviewer = PullRequestReviewers.query()\
+            reviewers = PullRequestReviewers.query()\
                 .filter(PullRequestReviewers.user_id == uid,
                         PullRequestReviewers.pull_request == pull_request)\
-                .scalar()
-            if reviewer:
-                Session().delete(reviewer)
+                .all()
+            # use .all() in case we accidentally added the same person twice
+            # this CAN happen due to the lack of DB checks
+            for obj in reviewers:
+                Session().delete(obj)
+
         if changed:
             pull_request.updated_on = datetime.datetime.now()
             Session().add(pull_request)
 
+        self.notify_reviewers(pull_request, ids_to_add)
         return ids_to_add, ids_to_remove
 
     def get_url(self, pull_request):
diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less
index 051e3ad0..c42b71e4 100644
--- a/rhodecode/public/css/main.less
+++ b/rhodecode/public/css/main.less
@@ -1329,13 +1329,6 @@ table.integrations {
     .reviewer {
         float: left;
     }
-
-    &.to-delete {
-        .user,
-        .reviewer {
-            text-decoration: line-through;
-        }
-    }
 }
 
 .reviewer_member_remove {
diff --git a/rhodecode/public/js/src/rhodecode/pullrequests.js b/rhodecode/public/js/src/rhodecode/pullrequests.js
index a9055a81..8d40ad04 100644
--- a/rhodecode/public/js/src/rhodecode/pullrequests.js
+++ b/rhodecode/public/js/src/rhodecode/pullrequests.js
@@ -28,11 +28,12 @@ var removeReviewMember = function(reviewer_id, mark_delete){
 
     if(mark_delete === true){
         if (reviewer){
-            // mark as to-remove
-            var obj = $('#reviewer_{0}_name'.format(reviewer_id));
-            obj.addClass('to-delete');
             // now delete the input
             $('#reviewer_{0} input'.format(reviewer_id)).remove();
+            // mark as to-delete
+            var obj = $('#reviewer_{0}_name'.format(reviewer_id));
+            obj.addClass('to-delete');
+            obj.css({"text-decoration":"line-through", "opacity": 0.5});
         }
     }
     else{
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako
index e808b991..f4fe1ab6 100644
--- a/rhodecode/templates/pullrequests/pullrequest_show.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_show.mako
@@ -362,7 +362,7 @@
                <div id="reviewers_container"></div>
             </div>
             <div>
-             <span id="update_pull_request" class="btn btn-small">${_('Save Changes')}</span>
+             <button id="update_pull_request" class="btn btn-small">${_('Save Changes')}</button>
             </div>
             %endif
           </div>
@@ -766,6 +766,9 @@
             });
 
             $('#update_pull_request').on('click', function(e){
+                $(this).attr('disabled', 'disabled');
+                $(this).addClass('disabled');
+                $(this).html(_gettext('saving...'));
                 updateReviewers(undefined, "${c.repo_name}", "${c.pull_request.pull_request_id}");
             });