[TIC-Web] Fix conflict issue

- Problem: The profile rpm can not be selected due to invalid rpm reference
- Measure: Modified to reference the valid rpm

Change-Id: I3c8cec935e1bf7de8320aa8375ef94459afb408a
Signed-off-by: Chulwoo Shin <cw1.shin@samsung.com>

diff --git a/public/src/js/page/package.js b/public/src/js/page/package.js
index 2a00b47..0f724b6 100644 (file)
--- a/public/src/js/page/package.js
+++ b/public/src/js/page/package.js
@@ -368,7 +368,7 @@ define([
     }
 
     function _checkConflicts(node, selected) {
-        var ret = {'result': false, 'message': null, 'conflictPkg': null};
+        var ret = {'result': false, 'message': null, 'data': null};
         // 1. Check whether node can be installed
         if (!_.isEmpty(node.provides)) {
             _.forEach(node.provides, function(provide) {
@@ -380,7 +380,7 @@ define([
                             logger.info('[Conflict] The "' + node.name + '" is conflict with "' + conflict.name + '"');
                             ret.message = 'The "' + node.name + '" is conflict with "' + conflict.name + '"';
                             ret.result = true;
-                            ret.conflictPkg = pkgInfo[conflict.name];
+                            ret.data = pkgInfo[conflict.name];
                             return false;
                         }
                     });
@@ -403,7 +403,7 @@ define([
                                 logger.info('[Conflict] The "' + provide.name + '" is conflict with "' + node.name + '"');
                                 ret.message = 'The "'+provide.name+'" is conflict with "'+node.name + '"';
                                 ret.result = true;
-                                ret.conflictPkg = pkg;
+                                ret.data = pkg;
                                 return false;
                             }
                         }
@@ -416,7 +416,7 @@ define([
                             logger.info('[Conflict] The "' + pkg.name + '" is conflit with "' + node.name + '"');
                             ret.message = 'The "' + pkg.name +'" is conflict with "' + node.name + '"';
                             ret.result = true;
-                            ret.conflictPkg = pkg
+                            ret.data = pkg
                             return false;
                         }
                     }
@@ -658,8 +658,8 @@ define([
             // Check for conflicts
             let checkCon = _checkConflicts(node, selected)
             if (checkCon.result === true) {
-                if (node.selfChecked === false && _isCompatablePkg(checkCon.conflictPkg, node)) {
-                    logger.info('[Compatible_1] "' + node.name + '" and "' + checkCon.conflictPkg.name + '" is compatible');
+                if (checkCon.data.selfChecked === false && _isCompatablePkg(checkCon.data, node)) {
+                    logger.info('[Compatible_1] "' + node.name + '" and "' + checkCon.data.name + '" is compatible');
                     comp_rpms[node.name] = node;
                 } else {
                     errorMsg = checkCon.message;