aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@gmail.com>2013-02-07 16:54:35 +0100
committerJulien Lancelot <julien.lancelot@gmail.com>2013-02-07 16:54:35 +0100
commit44f87ddcb7c15343b6bed710c12d9a440315b08b (patch)
tree4ba4100b2246485dedaa436bc247aa8a2d05efed /sonar-server
parentc2f1b1de11ef071fa40102cacc3a9ba80083fa58 (diff)
downloadsonarqube-44f87ddcb7c15343b6bed710c12d9a440315b08b.tar.gz
sonarqube-44f87ddcb7c15343b6bed710c12d9a440315b08b.zip
SONAR-3999 Handle error when a truncated license key is entered
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_LICENSE.html.erb3
1 files changed, 1 insertions, 2 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_LICENSE.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_LICENSE.html.erb
index ea93d74dec8..fb0db83149b 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_LICENSE.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_LICENSE.html.erb
@@ -3,7 +3,6 @@
<%
else
license = controller.java_facade.parseLicense(value)
- date = license.getExpirationDateAsString()
%>
<div class="width100">
<textarea rows="6" name="<%= name -%>" id="<%= id -%>" style="float: left;width: 390px"><%= h value -%></textarea>
@@ -21,7 +20,7 @@
<tr>
<td class="form-key-cell">Expiration:</td>
<td>
- <% if license.getExpirationDateAsString()
+ <% if license.getExpirationDate()
formatted_date = l(Date.parse(license.getExpirationDateAsString()))
%>
<%= license.isExpired() ? "<span class='error'>#{formatted_date}</span>" : formatted_date -%>