aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server/src/main/webapp/WEB-INF
diff options
context:
space:
mode:
authorGodin <mandrikov@gmail.com>2010-10-27 18:50:45 +0000
committerGodin <mandrikov@gmail.com>2010-10-27 18:50:45 +0000
commit6e0bd0e0c8a4bfb145131a266d6bb4d1c3be2b52 (patch)
tree13b98676f93400074e1f903179f850542dc30999 /sonar-server/src/main/webapp/WEB-INF
parent62346ef1b5ab79e61842f605db1d00224f4ab698 (diff)
downloadsonarqube-6e0bd0e0c8a4bfb145131a266d6bb4d1c3be2b52.tar.gz
sonarqube-6e0bd0e0c8a4bfb145131a266d6bb4d1c3be2b52.zip
SONAR-1886: Uninstall a plugin
Diffstat (limited to 'sonar-server/src/main/webapp/WEB-INF')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/controllers/updatecenter_controller.rb8
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb3
2 files changed, 9 insertions, 2 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/updatecenter_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/updatecenter_controller.rb
index b330dcebdde..a3014ae14ff 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/updatecenter_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/updatecenter_controller.rb
@@ -66,7 +66,7 @@ class UpdatecenterController < ApplicationController
end
end
- def cancel
+ def cancel_downloads
java_facade.cancelPluginDownloads()
flash[:notice]="Plugin downloads are canceled."
redirect_to :action => 'index'
@@ -97,6 +97,12 @@ class UpdatecenterController < ApplicationController
redirect_to :action => 'index'
end
+ def cancel_uninstalls
+ java_facade.cancelPluginUninstalls()
+ flash[:notice]="Plugin uninstalls are canceled."
+ redirect_to :action => 'index'
+ end
+
private
def load_update_finder
@finder=java_facade.getUpdateFinder(params[:reload]=='true')
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb
index 58772dbcec9..2a72d44f3f7 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb
@@ -25,12 +25,13 @@
<li><%= uninstall -%></li>
<% end %>
</ul>
+ <input type="submit" value="Cancel unistalls"></input>
</p>
</form>
<% end %>
<% if @downloads.size > 0 %>
-<form action="<%= ApplicationController.root_context -%>/updatecenter/cancel" method="post" class="warning">
+<form action="<%= ApplicationController.root_context -%>/updatecenter/cancel_downloads" method="post" class="warning">
<p>Sonar needs to be restarted in order to install the following plugins: <ul>
<% @downloads.each do |download| %>
<li><%= download -%></li>