APPLINK-6473:Fixed AddCommand request return response INVALID_DATA when parameter...

diff --git a/src/components/HMI/app/model/sdl/AppModel.js b/src/components/HMI/app/model/sdl/AppModel.js
index 2935324..6f8c300 100644 (file)
--- a/src/components/HMI/app/model/sdl/AppModel.js
+++ b/src/components/HMI/app/model/sdl/AppModel.js
@@ -253,7 +253,7 @@ SDL.SDLAppModel = Em.Object.extend({
          */
         addCommand: function (request) {
 
-            var parentID = request.params.menuParams.parentID >= 0 ? request.params.menuParams.parentID : 'top';
+            var parentID = request.params.menuParams.parentID > 0 ? request.params.menuParams.parentID : 'top';
 
             if (!this.get('commandsList.' + parentID)) {
                 this.commandsList[parentID] = [];

diff --git a/src/components/application_manager/src/commands/mobile/add_command_request.cc b/src/components/application_manager/src/commands/mobile/add_command_request.cc
index 99013da..999d0d4 100644 (file)
--- a/src/components/application_manager/src/commands/mobile/add_command_request.cc
+++ b/src/components/application_manager/src/commands/mobile/add_command_request.cc
@@ -98,8 +98,9 @@ void AddCommandRequest::Run() {
       SendResponse(false, mobile_apis::Result::DUPLICATE_NAME);
       return;
     }
-    if ((*message_)[strings::msg_params][strings::menu_params].keyExists(
-        hmi_request::parent_id)) {
+    if (((*message_)[strings::msg_params][strings::menu_params].keyExists(
+        hmi_request::parent_id)) && (0 != (*message_)[strings::msg_params]
+       [strings::menu_params][hmi_request::parent_id].asUInt())) {
       if (!CheckCommandParentId(app)) {
         SendResponse(false, mobile_apis::Result::INVALID_ID,
                      "Parent ID doesn't exist");