From 9cf4fa90e726e7bb84010a13f052babd998583b9 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Wed, 29 Jan 2014 12:46:22 +0600 Subject: [PATCH] New Issues Page: fix sources --- .../webapp/javascripts/navigator/handlebars-extensions.js | 2 +- .../src/main/webapp/javascripts/navigator/issues.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sonar-server/src/main/webapp/javascripts/navigator/handlebars-extensions.js b/sonar-server/src/main/webapp/javascripts/navigator/handlebars-extensions.js index 7bc056df41b..49b8c14f08c 100644 --- a/sonar-server/src/main/webapp/javascripts/navigator/handlebars-extensions.js +++ b/sonar-server/src/main/webapp/javascripts/navigator/handlebars-extensions.js @@ -86,7 +86,7 @@ return { lineNumber: line, code: code, - scm: scm[line] ? { author: scm[line][0], date: scm[line][1] } : undefined + scm: (scm && scm[line]) ? { author: scm[line][0], date: scm[line][1] } : undefined } }); diff --git a/sonar-server/src/main/webapp/javascripts/navigator/issues.js b/sonar-server/src/main/webapp/javascripts/navigator/issues.js index b1685f9d6d8..7e2761ab250 100644 --- a/sonar-server/src/main/webapp/javascripts/navigator/issues.js +++ b/sonar-server/src/main/webapp/javascripts/navigator/issues.js @@ -182,13 +182,16 @@ jQuery(function() { fetchSource: function(view) { + var from = this.model.get('line') - 10, + to = this.model.get('line') + 10; + return jQuery.ajax({ type: 'GET', url: baseUrl + '/api/sources/show', data: { key: this.model.get('component'), - from: this.model.get('line') - 10, - to: this.model.get('line') + 10, + from: from >= 0 ? from : 0, + to: to, format: 'json' } }).done(function(r) { -- 2.39.5