opendev/gerrit
Code Issues Proposed changes

Merge "Fix faulty equality comparison in download dialog"

Browse Source
This commit is contained in:
Kasper Nilsson
2017-05-17 22:45:49 +00:00
committed by Gerrit Code Review
parent 8fe83b5d4d b9451ec51c
commit 96fa08bea1
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
polygerrit-ui/app/elements/change/gr-download-dialog/gr-download-dialog.js
View File

@@ -79,7 +79,7 @@
_computeDownloadCommands(change, patchNum, _selectedScheme) { _computeDownloadCommands(change, patchNum, _selectedScheme) {
let commandObj; let commandObj;
for (const rev in change.revisions) { for (const rev in change.revisions) {
if (change.revisions[rev]._number === patchNum && if (change.revisions[rev]._number === parseInt(patchNum, 10) &&
change.revisions[rev].fetch.hasOwnProperty(_selectedScheme)) { change.revisions[rev].fetch.hasOwnProperty(_selectedScheme)) {
commandObj = change.revisions[rev].fetch[_selectedScheme].commands; commandObj = change.revisions[rev].fetch[_selectedScheme].commands;
break; break;
@@ -112,7 +112,7 @@
_computeDownloadFilename(change, patchNum, zip) { _computeDownloadFilename(change, patchNum, zip) {
let shortRev; let shortRev;
for (const rev in change.revisions) { for (const rev in change.revisions) {
if (change.revisions[rev]._number === patchNum) { if (change.revisions[rev]._number === parseInt(patchNum, 10)) {
shortRev = rev.substr(0, 7); shortRev = rev.substr(0, 7);
break; break;
} }
@@ -126,9 +126,9 @@
}, },
_computeSchemes(change, patchNum) { _computeSchemes(change, patchNum) {
for (const rev in change.revisions) { for (const rev of Object.values(change.revisions || {})) {
if (change.revisions[rev]._number === patchNum) { if (rev._number === parseInt(patchNum, 10)) {
const fetch = change.revisions[rev].fetch; const fetch = rev.fetch;
if (fetch) { if (fetch) {
return Object.keys(fetch).sort(); return Object.keys(fetch).sort();
} }

8
polygerrit-ui/app/elements/change/gr-download-dialog/gr-download-dialog_test.html
View File

@@ -117,7 +117,7 @@ limitations under the License.
setup(() => { setup(() => {
element = fixture('basic'); element = fixture('basic');
element.change = getChangeObjectNoFetch(); element.change = getChangeObjectNoFetch();
element.patchNum = 1; element.patchNum = '1';
element.config = { element.config = {
schemes: { schemes: {
'anonymous http': {}, 'anonymous http': {},
@@ -144,7 +144,7 @@ limitations under the License.
setup(() => { setup(() => {
element = fixture('basic'); element = fixture('basic');
element.change = getChangeObject(); element.change = getChangeObject();
element.patchNum = 1; element.patchNum = '1';
element.config = { element.config = {
schemes: { schemes: {
'anonymous http': {}, 'anonymous http': {},
@@ -242,7 +242,7 @@ limitations under the License.
element = fixture('loggedIn'); element = fixture('loggedIn');
element.change = getChangeObject(); element.change = getChangeObject();
element.patchNum = 1; element.patchNum = '1';
element.config = { element.config = {
schemes: { schemes: {
'anonymous http': {}, 'anonymous http': {},
@@ -285,7 +285,7 @@ limitations under the License.
}); });
element = fixture('loggedIn'); element = fixture('loggedIn');
element.change = getChangeObject(); element.change = getChangeObject();
element.patchNum = 1; element.patchNum = '1';
element.config = { element.config = {
schemes: {'anonymous http': {}, 'http': {}, 'repo': {}, 'ssh': {}}, schemes: {'anonymous http': {}, 'http': {}, 'repo': {}, 'ssh': {}},
archives: ['tgz', 'tar', 'tbz2', 'txz'], archives: ['tgz', 'tar', 'tbz2', 'txz'],