Browse Source

HPCC-1835 Configmgr - Enable deletion of components with same names

- Based on feedback removed redundant code
- Based on feedback added minor optimization

Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>
Gleb Aronsky 12 years ago
parent
commit
7803feb8eb

+ 0 - 1
esp/files/scripts/configmgr/navtree.js

@@ -778,7 +778,6 @@ function createNavigationTree(navTreeData) {
 
                 var temp = o.responseText.split(/<CompName>/g);
                 var temp1 = temp[1].split(/<\/CompName>/g);
-                getWaitDlg().hide();
                 navDS.flushCache();
                 form.isChanged.value = "true";
                 refreshNavTree(navDS, navDT, temp1[0])

+ 1 - 1
esp/services/WsDeploy/WsDeployService.cpp

@@ -4373,9 +4373,9 @@ bool CWsDeployFileInfo::handleComponent(IEspContext &context, IEspHandleComponen
           break;
         }
       }
-      resp.setStatus(errMsg.length() > 1 ? errMsg.str() : "true");
       resp.setCompName(compName);
     }
+    resp.setStatus(errMsg.length() > 1 ? errMsg.str() : "true");
   }
   else if (!strcmp(operation, "Duplicate"))
   {