From 51a33c98ccce945a9fb6680d745eb8f63207b67b Mon Sep 17 00:00:00 2001 From: Chulwoo Shin Date: Mon, 20 Mar 2017 11:18:20 +0900 Subject: [PATCH] [TIC-Web] modify text name of meta-package - display meta-package's summary in treeview Change-Id: Iee6e0dd2143ddab1fb23df5a45159223bef03ddb Signed-off-by: Chulwoo Shin --- public/src/js/page/package.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/public/src/js/page/package.js b/public/src/js/page/package.js index 6fb3cf4..6584065 100644 --- a/public/src/js/page/package.js +++ b/public/src/js/page/package.js @@ -200,6 +200,14 @@ define([ return data[name]; } + function _findFromNode(node) { + if ('metaname' in node) { + return pkgInfo[node.metaname]; + } else { + return pkgInfo[node.text]; + } + } + function _setDefaultPackage(defaultPackages) { var nodes = [] var pickDefault = _.pick(pkgInfo, defaultPackages); @@ -213,9 +221,6 @@ define([ }); $tree.treeview('checkNode', [nodes, { silent: true }]); - // _.forEach(nodes, function(node) { - // node.state.checked = true; - // }); } // Compares two rpm version numbers (e.g. "1.7.1" or "1.2b"). @@ -887,7 +892,7 @@ define([ var summary = $('#tic-package-info-summary').empty(); var description = $('#tic-package-info-description').empty(); - var pkg = pkgInfo[node.text]; + var pkg = _findFromNode(node); if (!_.isEmpty(pkg)) { if (!_.isEmpty(pkg.name)) { @@ -928,7 +933,7 @@ define([ */ function _onNodeChecked(event, node) { var startTS = performance.now(); - var localNode = _find(node.text); + var localNode = _findFromNode(node); if (_.isEmpty(localNode)) { // MISC is virtual pacakge. @@ -988,7 +993,7 @@ define([ */ function _onNodeUnchecked(event, node) { var startTS = performance.now(); - var localNode = _find(node.text); + var localNode = _findFromNode(node); if (_.isEmpty(localNode)) { // MISC is virtual pacakge. @@ -1060,7 +1065,7 @@ define([ packages = _.values(nodes); _.forEach(nodes, function(node, key) { // add a reference variable for treeview - var pkg = pkgInfo[node.text] + var pkg = _findFromNode(node); if (pkg) { if (_.isEmpty(pkg.view)) { pkg.view = [node]; @@ -1069,7 +1074,6 @@ define([ } } }); - _setDefaultPackage(rawData.defaultpackages); _updateSummary(); resolve(); -- 2.7.4