summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@gmail.com>2013-02-21 15:05:45 +0100
committerJulien Lancelot <julien.lancelot@gmail.com>2013-02-21 15:05:45 +0100
commita195ff4ce53d4894f4e97d7c7bfeaf37ea382286 (patch)
tree836fadbc4ff12c13f06078982038bcbd87da3bcc
parent7ce643648b781666ea5a51c42210dfee4b4a0be6 (diff)
downloadsonarqube-a195ff4ce53d4894f4e97d7c7bfeaf37ea382286.tar.gz
sonarqube-a195ff4ce53d4894f4e97d7c7bfeaf37ea382286.zip
Remove useless variable @update_center_referential
-rw-r--r--sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java2
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/controllers/updatecenter_controller.rb5
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb2
3 files changed, 3 insertions, 6 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java b/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java
index 8aed2d2ad10..5658de4e291 100644
--- a/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java
+++ b/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java
@@ -81,7 +81,7 @@ public class PluginDownloader implements ServerComponent {
}
public void download(String pluginKey, Version version) {
- for (Release release : updateCenterMatrixFactory.getUpdateCenter(false).findInstallablePlugins(pluginKey, version)) {
+ for (Release release : updateCenterMatrixFactory.getUpdateCenter(true).findInstallablePlugins(pluginKey, version)) {
try {
downloadRelease(release);
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 37c62052a35..69c9ed9c40b 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
@@ -36,7 +36,7 @@ class UpdatecenterController < ApplicationController
def available
@uninstalls=java_facade.getPluginUninstalls()
@downloads=java_facade.getPluginDownloads()
- @update_center_referential=nil
+ @update_plugin_center=nil
@updates_by_category={}
load_plugin_center()
@@ -56,7 +56,6 @@ class UpdatecenterController < ApplicationController
@uninstalls=java_facade.getPluginUninstalls()
@downloads=java_facade.getPluginDownloads()
- @update_center_referential=nil
@update_plugin_center=nil
@updates_by_plugin={}
@installed_plugins={}
@@ -123,7 +122,6 @@ class UpdatecenterController < ApplicationController
@uninstalls=java_facade.getPluginUninstalls()
@downloads=java_facade.getPluginDownloads()
- @update_center_referential=nil
@update_plugin_center=nil
@sonar_updates=[]
load_plugin_center()
@@ -136,7 +134,6 @@ class UpdatecenterController < ApplicationController
def load_plugin_center
@update_plugin_center = java_facade.getUpdatePluginCenter(params[:reload]=='true')
- @update_center_referential = @update_plugin_center.updateCenterPluginReferential
@installed_plugin_referential = java_facade.installedPluginReferential
end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb
index bc5f84e67d3..6bc0f196fc7 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb
@@ -46,7 +46,7 @@ function installPlugin(key) {
<% index = 0 %>
<% release.children.each do |child|
- child_plugin = @update_center_referential.findPlugin(child.key)
+ child_plugin = child.artifact
%>
<tr>
<% if index == 0 %>