diff options
| author | stephenbroyer <stephen.broyer@sonarsource.com> | 2013-09-27 12:08:47 +0200 |
|---|---|---|
| committer | stephenbroyer <stephen.broyer@sonarsource.com> | 2013-09-27 17:07:24 +0200 |
| commit | 10eecd02d628c22e53d9c30aff9f5fd091f074b1 (patch) | |
| tree | 74c959cce47a153eaa4e477ff8bcaf4b1175b6d6 /sonar-server | |
| parent | 2dfb622563a682e6bf060b12baa5c461635dd812 (diff) | |
| download | sonarqube-10eecd02d628c22e53d9c30aff9f5fd091f074b1.tar.gz sonarqube-10eecd02d628c22e53d9c30aff9f5fd091f074b1.zip | |
SONAR-4612 Remove prototypejs from "Configuration" administration consoles
(permit to display error message correctly)
Diffstat (limited to 'sonar-server')
2 files changed, 3 insertions, 3 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb index f548a780938..9b4bb164c5d 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb @@ -20,7 +20,7 @@ url:'<%=ApplicationController.root_context-%>/encryption_configuration/generate_secret', type:'post', success:function(response){$j('#secret_content').html(response);}, - error:function(response){ $j('#secret_error').html(response); $j('#secret_error').show();} + error:function(response){$j('#secret_error').html(response.responseText); $j('#secret_error').show();} }); return false;"> </input> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb index 137ed5df7c1..c71a2673924 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb @@ -23,7 +23,7 @@ }, error:function(response) { - $j('#encryption_error').html(response); + $j('#encryption_error').html(response.responseText); $j('#encryption_error').show(); $j('#encrypted_section').hide(); }, @@ -39,7 +39,7 @@ <div id="encrypted_section" style="display:none"></div> <span id="encryption_error" class="error" style="display:none"></span> - <p>Note that the <%= link_to 'secret key can be changed', {:action => 'generate_secret_form'}, :class => 'link-action', :id => 'link-generate-key' %> + <p><br/>Note that the <%= link_to 'secret key can be changed', {:action => 'generate_secret_form'}, :class => 'link-action', :id => 'link-generate-key' %> but all the encrypted properties will have to be updated. <a href="http://docs.codehaus.org/display/SONAR/Settings+Encryption" class="external" target="sonar_doc">More information</a>.</p> </td> </tr> |