From 1ebef1e3ddf258bfcf4c9b2960dc49b017cc4d46 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Mon, 26 May 2014 14:21:26 +0600 Subject: [PATCH] SONAR-5209 Better scm display --- .../coffee/component-viewer/source.coffee | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/sonar-server/src/main/coffee/component-viewer/source.coffee b/sonar-server/src/main/coffee/component-viewer/source.coffee index a89751817e1..a69c2db557c 100644 --- a/sonar-server/src/main/coffee/component-viewer/source.coffee +++ b/sonar-server/src/main/coffee/component-viewer/source.coffee @@ -191,11 +191,28 @@ define [ source + getSCMForLine: (lineNumber) -> + scm = @model.get('scm') || [] + closest = -1 + closestIndex = -1 + scm.forEach (s, i) -> + line = s[0] + if line <= lineNumber && line > closest + closest = line + closestIndex = i + if closestIndex != -1 then scm[closestIndex] else null + + augmentWithSCM: (source) -> scm = @model.get('scm') || [] scm.forEach (s) -> - line = source[s[0] - 1] + line = _.findWhere source, lineNumber: s[0] line.scm = author: s[1], date: s[2] + @showBlocks.forEach (block) => + scmForLine = @getSCMForLine block.from + if scmForLine? + line = _.findWhere source, lineNumber: block.from + line.scm = author: scmForLine[1], date: scmForLine[2] source @@ -212,8 +229,7 @@ define [ prepareSource: -> source = @model.get 'source' source = _.map source, (item) => - line = item[0] - lineNumber: line, code: item[1] + lineNumber: item[0], code: item[1] if @options.main.settings.get 'coverage' source = @augmentWithCoverage source -- 2.39.5