diff options
| author | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2014-07-29 13:51:21 +0200 |
|---|---|---|
| committer | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2014-07-29 13:51:27 +0200 |
| commit | 1fd4a8cc71c40dfdcf027f6bfb724e092c058196 (patch) | |
| tree | 361bab0a3f2746e6edf41371863b25fc16ded71d /server | |
| parent | 07f59ac044e076e29813bdd7e8837a148e05a770 (diff) | |
| download | sonarqube-1fd4a8cc71c40dfdcf027f6bfb724e092c058196.tar.gz sonarqube-1fd4a8cc71c40dfdcf027f6bfb724e092c058196.zip | |
SONAR-5037 Remove "automatic" plugin upgrade features from "system updates" tab
Diffstat (limited to 'server')
| -rw-r--r-- | server/sonar-web/pom.xml | 1 | ||||
| -rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb | 39 |
2 files changed, 15 insertions, 25 deletions
diff --git a/server/sonar-web/pom.xml b/server/sonar-web/pom.xml index e61cb39ede6..cc6e2043a1b 100644 --- a/server/sonar-web/pom.xml +++ b/server/sonar-web/pom.xml @@ -350,7 +350,6 @@ <sonar.log.console>true</sonar.log.console> <sonar.log.profilingLevel>BASIC</sonar.log.profilingLevel> <sonar.web.context>/dev</sonar.web.context> - <sonar.updatecenter.activate>false</sonar.updatecenter.activate> </systemProperties> </configuration> </plugin> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb index 9399514f7bc..9b7c63199ce 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb @@ -69,34 +69,25 @@ Follow those steps to upgrade SonarQube from version <%= sonar_version -%> to version <%= release.getVersion() -%> : <ol class="bulletpoints"> + <li>Stop SonarQube</li> + <li><%= link_to 'Download', release.getDownloadUrl(), :class => 'external' -%> and install + SonarQube <%= release.getVersion() -%> after having carefully read the <a href="http://docs.codehaus.org/display/SONAR/Upgrading" class="external">upgrade guide</a>. + </li> <% update.getIncompatiblePlugins().each do |incompatible_plugin| %> - <li> - <form method="post" - action="<%= ApplicationController.root_context -%>/updatecenter/uninstall?key=<%= incompatible_plugin.getKey() -%>&from=system_updates" - style="display: inline-block"> - <%= image_tag 'warning.png' -%> - <input type="submit" value="Uninstall" class="red-button" onClick="return submitForm(this);"/> - the plugin <%= incompatible_plugin.getName() -%> which is not compatible with - SonarQube <%= release.getVersion() -%>. - </form> - </li> + <li> + Uninstall the plugin <%= incompatible_plugin.getName() -%> which is not compatible with + SonarQube <%= release.getVersion() -%>. + </form> + </li> <% end %> <% update.getPluginsToUpgrade().each do |plugin_to_upgrade| %> - <li> - <form method="post" id="upgrade-form-<%= plugin_to_upgrade.getArtifact().getKey() -%>" - action="<%= ApplicationController.root_context -%>/updatecenter/install?key=<%= plugin_to_upgrade.getArtifact().getKey() -%>&version=<%= plugin_to_upgrade.getVersion() -%>&from=system_updates" - style="display: inline-block"> - <input type="submit" id="upgrade-submit-<%= plugin_to_upgrade.getArtifact().getKey() -%>" value="Upgrade" onClick="return submitForm(this);"/> - the plugin <%= plugin_to_upgrade.getArtifact().getName() -%> to - version <%= plugin_to_upgrade.getVersion() -%> - </form> - </li> - <% end %> - <li>Stop Sonar</li> - <li><%= link_to 'Download', release.getDownloadUrl(), :class => 'external' -%> and install - SonarQube <%= release.getVersion() -%> after having carefully read the <a href="http://docs.codehaus.org/display/SONAR/Upgrading" class="external">upgrade guide</a>. + <li> + Replace current version of plugin <%= plugin_to_upgrade.getArtifact().getName() -%> by + version <%= plugin_to_upgrade.getVersion() -%> + </form> </li> - <li>Start Sonar</li> + <% end %> + <li>Start SonarQube</li> </ol> <% else %> |