Merge latest changes from candidate-3.6.x into candidate-3.6.2

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
g-pan · Mar 28, 2012 · 1c3126e · 1c3126e
2 parents d9f5ba0 + 10ff9bf
commit 1c3126e
Show file tree

Hide file tree

Showing 9 changed files with 1,382 additions and 368 deletions.
diff --git a/docs/images/Permissions001.jpg b/docs/images/Permissions001.jpg
diff --git a/docs/images/Permissions002.jpg b/docs/images/Permissions002.jpg
diff --git a/docs/images/Permissions003.jpg b/docs/images/Permissions003.jpg
diff --git a/docs/images/Permissions004.jpg b/docs/images/Permissions004.jpg
diff --git a/docs/images/Permissions005.jpg b/docs/images/Permissions005.jpg
diff --git a/docs/wip/user_Sect.xml b/docs/wip/user_Sect.xml
diff --git a/esp/eclwatch/ws_XSLT/access_groupdelete.xslt b/esp/eclwatch/ws_XSLT/access_groupdelete.xslt
@@ -20,7 +20,7 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 <xsl:output method="html"/>
     <xsl:output method="html"/>
-    <xsl:variable name="groupnamestr" select="/GroupDeleteResponse/Groupnames"/>
+    <xsl:variable name="groupnamestr" select="/GroupActionResponse/Groupnames"/>
     <xsl:template match="/">
         <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
         <head>
@@ -37,7 +37,7 @@
                                     if (action < 1 || groupnamestr=='')
                                         document.location.href='/ws_access/Groups';
                                     else
-                                        document.location.href='/ws_access/GroupDelete?'+groupnamestr;
+                                        document.location.href='/ws_access/GroupAction?ActionType=Delete&'+groupnamestr;
                          }
 
                    ]]></xsl:text>
@@ -51,7 +51,7 @@
         </html>
     </xsl:template>
 
-    <xsl:template match="GroupDeleteResponse">
+    <xsl:template match="GroupActionResponse">
         <xsl:choose>
             <xsl:when test="not(Permissions/Permission[1])">
                 <table>
@@ -104,10 +104,10 @@
                     </tr>
                     <tr>
                         <td>
-                            <input type="submit" class="sbutton" id="Continue" value="ContinueDelete" onclick="btnclicked(1)"/>
+                            <input type="submit" class="sbutton" style="width: 120px;" id="Continue" value="ContinueDelete" onclick="btnclicked(1)"/>
                         </td>
                         <td>
-                            <input type="submit" class="sbutton" id="Cancel" value="CancelDelete" onclick="btnclicked(0)"/>
+                            <input type="submit" class="sbutton" style="width: 100px;" id="Cancel" value="CancelDelete" onclick="btnclicked(0)"/>
                         </td>
                     </tr>
                     <tr>

diff --git a/esp/services/WsDeploy/WsDeployService.cpp b/esp/services/WsDeploy/WsDeployService.cpp
@@ -1307,6 +1307,22 @@ bool CWsDeployFileInfo::saveSetting(IEspContext &context, IEspSaveSettingRequest
 
         if (!strcmp(pszAttrName, "name"))
         {
+          if (!pszSubType || !*pszSubType)
+          {
+            StringBuffer rundir;
+
+            if (!getConfigurationDirectory(pEnvRoot->queryPropTree("Software/Directories"), "run", pszCompType, pszNewValue, rundir))
+              rundir.clear().appendf(RUNTIME_DIR"/%s", pszNewValue);
+
+            Owned<IPropertyTreeIterator> iterInsts = pComp->getElements(XML_TAG_INSTANCE);
+
+            ForEach (*iterInsts)
+              iterInsts->query().setProp(XML_ATTR_DIRECTORY, rundir.str());
+
+            if (!strcmp(pszCompType, XML_TAG_ROXIECLUSTER))
+              pComp->setProp(XML_ATTR_DIRECTORY, rundir);
+          }
+
           StringBuffer sbold, sbnew, sbMsg;
           bool ret = false;
           if (pszSubType && !strcmp(pszSubType, "EspBinding"))

diff --git a/esp/services/ws_workunits/ws_workunitsService.cpp b/esp/services/ws_workunits/ws_workunitsService.cpp
@@ -1623,6 +1623,15 @@ void doWUQueryByXPath(IEspContext &context, IEspWUQueryRequest & req, IEspWUQuer
     if (!count)
         count=100;
 
+    if (wlist.getSize() < 1)
+    {
+        resp.setNumWUs(0);
+        return;
+    }
+
+    if (wlist.getSize() < count)
+        count = (int) wlist.getSize() - 1;
+
     WsWuSearch::iterator begin, end;
 
     if(notEmpty(req.getAfter()))
@@ -1657,11 +1666,10 @@ void doWUQueryByXPath(IEspContext &context, IEspWUQueryRequest & req, IEspWUQuer
     for(;begin!=end;begin++)
     {
         Owned<IEspECLWorkunit> info = createECLWorkunit("","");
-        WsWuInfo winfo(context, req.getWuid());
+        WsWuInfo winfo(context, begin->c_str());
         winfo.getCommon(*info, 0);
-        results.append(*info);
+        results.append(*info.getClear());
     }
-
     resp.setPageSize(abs(count));
     resp.setWorkunits(results);