Przeglądaj źródła

Merge pull request #9092 from wangkx/h16260

HPCC-16260 Support new public parameter per DZ

Reviewed-By: Mark Kelly <mark.kelly@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 8 lat temu
rodzic
commit
38d72110b5

+ 2 - 0
esp/services/ws_fs/ws_fsBinding.cpp

@@ -233,6 +233,8 @@ IPropertyTree* CFileSpraySoapBindingEx::createPTreeForXslt(const char* method, c
         Owned<IPropertyTreeIterator> it = pEnvSoftware->getElements("DropZone");
         ForEach(*it)
         {
+            if (!it->query().getPropBool("@ECLWatchVisible", true))
+                continue;
             IPropertyTree* pDropZone = pSoftware->addPropTree("DropZone", &it->get());
             //get IP Address of the computer associated with this drop zone
             const char* pszComputer = it->query().queryProp("@computer");

+ 2 - 0
esp/services/ws_fs/ws_fsService.cpp

@@ -3177,6 +3177,8 @@ bool CFileSprayEx::onDropZoneFiles(IEspContext &context, IEspDropZoneFilesReques
             ForEach(*it)
             {
                 IPropertyTree& pDropZone = it->query();
+                if (!pDropZone.getPropBool("@ECLWatchVisible", true))
+                    continue;
 
                 //get IP Address of the computer associated with this drop zone
                 const char* pszName = pDropZone.queryProp("@name");

+ 2 - 0
esp/smc/SMCLib/TpWrapper.cpp

@@ -608,6 +608,8 @@ void CTpWrapper::getTpDropZones(IArrayOf<IConstTpDropZone>& list)
     ForEach(*services)
     {
         IPropertyTree& serviceTree = services->query();
+        if (!serviceTree.getPropBool("@ECLWatchVisible", true))
+            continue;
 
         Owned<IEspTpDropZone> pService = createTpDropZone("","");
         pService->setName(serviceTree.queryProp("@name"));