SONAR-5146 Some rules might not have some "rules.created_at" date and in that case...

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 20b713f87351a3c12757ccee671f24be4daabce8..ca4b6133421d3e1905844fe8531fc853a500a75d 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -1711,9 +1711,7 @@ rules_configuration.tags_filters=Tags
 rules_configuration.sort_by=Sort by:
 rules_configuration.rule_name=Rule name
 rules_configuration.creation_date=Creation date
-rules_configuration.removal_date=Removal date
 rules_configuration.available_since=Available since
-rules_configuration.removed_since=Removed since
 rules_configuration.select_tags=Select Tags
 rules_configuration.select_tags_for_rule=Select Tags for Rule:
 rules_configuration.available_tags=Available Tags

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
index 1607aabdf85916e7e32d8faa594ddf8074d72f0b..b2adcd1acacc05dbf6cbadebfdd823350b6cd5bb 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
@@ -122,10 +122,9 @@
       <span id="rule_repository_<%= rule.id -%>"><%= message('rules_configuration.repository') %>: <%= rule.repositoryKey %></span>
       &nbsp;<%= image_tag 'sep12.png' -%>&nbsp;
       <span id="rule_key_<%= rule.id -%>"><%= message('key') %>: <%= rule.key %></span>
-      &nbsp;<%= image_tag 'sep12.png' -%>&nbsp;
-      <% if rule.status == "REMOVED" %>
-        <span id="rule_available_since_<%= rule.id -%>"><%= message('rules_configuration.removed_since') %>: <%= human_short_date(Api::Utils.java_to_ruby_datetime(rule.updatedAt)) %></span>
-      <% else %>
+      <!-- Some rules might not have some "rules.created_at" date, see http://jira.codehaus.org/browse/SONAR-5146 -->
+      <% if rule.createdAt -%>
+        &nbsp;<%= image_tag 'sep12.png' -%>&nbsp;
         <span id="rule_available_since_<%= rule.id -%>"><%= message('rules_configuration.available_since') %> <%= human_short_date(Api::Utils.java_to_ruby_datetime(rule.createdAt)) %></span>
       <% end %>
     </div>