summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2011-11-02 10:01:24 +0100
committerSimon Brandhof <simon.brandhof@gmail.com>2011-11-02 11:28:50 +0100
commit41fdffbc9ce51080a55e33fcee1a2f5b7e1573cc (patch)
treeaa57318eb4892a014dc75b73c9369844d69ee43e
parent4910189e692bae6671f47f20719a3828ccb45a41 (diff)
downloadsonarqube-41fdffbc9ce51080a55e33fcee1a2f5b7e1573cc.tar.gz
sonarqube-41fdffbc9ce51080a55e33fcee1a2f5b7e1573cc.zip
Fix the default value of the option :display_scm in the ruby helper SourceHelper#snapshot_source_to_html
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/helpers/source_helper.rb2
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/resource/_duplications_source_snippet.html.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/source_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/source_helper.rb
index 2d6ae9a3d14..edcac4e60c3 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/source_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/source_helper.rb
@@ -35,7 +35,7 @@ module SourceHelper
revisions_by_line={}
authors_by_line={}
dates_by_line={}
- if options[:display_scm]||nil
+ unless options[:display_scm]==false
panel.display_scm=(snapshot.measure('last_commit_datetimes_by_line')!=nil)
authors_by_line=load_distribution(snapshot,'authors_by_line')
revisions_by_line=load_distribution(snapshot,'revisions_by_line')
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_duplications_source_snippet.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_duplications_source_snippet.html.erb
index eb3d0cc4b89..459c17776af 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_duplications_source_snippet.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_duplications_source_snippet.html.erb
@@ -21,7 +21,7 @@
</p>
<% end %>
- <%= snapshot_source_to_html(resource.last_snapshot, {:line_range => (from_line)..(to_line)}) -%>
+ <%= snapshot_source_to_html(resource.last_snapshot, {:line_range => from_line..to_line}) -%>
<% if lines_count > 5 %>
<p class="small">