Comment & resolve button no longer looks for can-resolve attribute

Fixed some bugs when removing notes

1 files changed, 8 insertions, 12 deletions

diff --git a/app/assets/javascripts/diff_notes/services/resolve.js.es6 b/app/assets/javascripts/diff_notes/services/resolve.js.es6
index b9fe6caf7e8..5e5c476b514 100644
--- a/app/assets/javascripts/diff_notes/services/resolve.js.es6
+++ b/app/assets/javascripts/diff_notes/services/resolve.js.es6
@@ -9,20 +9,21 @@
       Vue.http.headers.common['X-CSRF-Token'] = $.rails.csrfToken();
     }
 
-    resolve(namespace, noteId) {
+    prepareRequest(namespace) {
       this.setCSRF();
       if (Vue.http.options.root !== `/${namespace}`) {
         Vue.http.options.root = `/${namespace}`;
       }
+    }
+
+    resolve(namespace, noteId) {
+      this.prepareRequest(namespace);
 
       return this.noteResource.save({ noteId }, {});
     }
 
     unresolve(namespace, noteId) {
-      this.setCSRF();
-      if (Vue.http.options.root !== `/${namespace}`) {
-        Vue.http.options.root = `/${namespace}`;
-      }
+      this.prepareRequest(namespace);
 
       return this.noteResource.delete({ noteId }, {});
     }
@@ -61,11 +62,7 @@
     resolveAll(namespace, mergeRequestId, discussionId) {
       const discussion = CommentsStore.state[discussionId];
 
-      this.setCSRF();
-
-      if (Vue.http.options.root !== `/${namespace}`) {
-        Vue.http.options.root = `/${namespace}`;
-      }
+      this.prepareRequest(namespace);
 
       discussion.loading = true;
 
@@ -78,8 +75,7 @@
     unResolveAll(namespace, mergeRequestId, discussionId) {
       const discussion = CommentsStore.state[discussionId];
 
-      this.setCSRF();
-      Vue.http.options.root = `/${namespace}`;
+      this.prepareRequest(namespace);
 
       discussion.loading = true;