aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2015-06-08 10:13:56 +0200
committerStas Vilchik <vilchiks@gmail.com>2015-06-08 11:43:11 +0200
commite97ffed678a69b0c48ad62acc4bf98d036f2cd97 (patch)
tree456067bb1c091a349bc2ae9bf74d0e7b0ab4ab47
parent0d709d895d9f5ca72c2abf81526af7e5850e8494 (diff)
downloadsonarqube-e97ffed678a69b0c48ad62acc4bf98d036f2cd97.tar.gz
sonarqube-e97ffed678a69b0c48ad62acc4bf98d036f2cd97.zip
SONAR-6581 fix deletion of provisioned project
-rw-r--r--server/sonar-web/src/main/js/apps/provisioning/project.js4
-rw-r--r--server/sonar-web/src/test/js/provisioning-spec.js4
2 files changed, 4 insertions, 4 deletions
diff --git a/server/sonar-web/src/main/js/apps/provisioning/project.js b/server/sonar-web/src/main/js/apps/provisioning/project.js
index 90963b7a1b5..00bc73dd150 100644
--- a/server/sonar-web/src/main/js/apps/provisioning/project.js
+++ b/server/sonar-web/src/main/js/apps/provisioning/project.js
@@ -18,9 +18,9 @@ define(function () {
}
if (method === 'delete') {
_.defaults(opts, {
- url: this.urlRoot() + '/delete',
+ url: this.urlRoot() + '/bulk_delete',
type: 'POST',
- data: { uuids: this.id }
+ data: { ids: this.id }
});
}
return Backbone.ajax(opts);
diff --git a/server/sonar-web/src/test/js/provisioning-spec.js b/server/sonar-web/src/test/js/provisioning-spec.js
index 28482a165d5..6a1b6b6abb2 100644
--- a/server/sonar-web/src/test/js/provisioning-spec.js
+++ b/server/sonar-web/src/test/js/provisioning-spec.js
@@ -209,7 +209,7 @@ casper.test.begin(testName('Delete'), 1, function (test) {
.start(lib.buildUrl('provisioning'), function () {
lib.setDefaultViewport();
this.searchMock = lib.mockRequestFromFile('/api/projects/provisioned', 'search.json');
- this.updateMock = lib.mockRequestFromFile('/api/projects/delete', 'delete-error.json', { status: 400 });
+ this.updateMock = lib.mockRequestFromFile('/api/projects/bulk_delete', 'delete-error.json', { status: 400 });
})
.then(function () {
@@ -237,7 +237,7 @@ casper.test.begin(testName('Delete'), 1, function (test) {
.then(function () {
lib.clearRequestMock(this.updateMock);
- lib.mockRequest('/api/projects/delete', '{}', { data: { uuids: 'id-javascript'} });
+ lib.mockRequest('/api/projects/bulk_delete', '{}', { data: { ids: 'id-javascript'} });
casper.click('#delete-project-submit');
casper.waitWhileSelector('[data-id="id-javascript"]');
})