浏览代码

Revised based on review

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>
Kevin Wang 13 年之前
父节点
当前提交
293d5d5d31
共有 2 个文件被更改,包括 18 次插入30 次删除
  1. 17 29
      esp/eclwatch/ws_XSLT/access_accountpermissions.xslt
  2. 1 1
      esp/services/ws_access/ws_accessService.cpp

+ 17 - 29
esp/eclwatch/ws_XSLT/access_accountpermissions.xslt

@@ -212,17 +212,13 @@
     <body class="yui-skin-sam" onload="nof5();onLoad()">
             <h3>Permissions of <xsl:value-of select="AccountName"/></h3>
             <p/>
-            <xsl:choose>
-                <xsl:when test="not(Permissions/Permission[1])">
-                </xsl:when>
-                <xsl:otherwise>
-                    <!--xsl:apply-templates select="Permissions"/-->
-                    <xsl:apply-templates select="Permissions">
-                        <xsl:with-param name="AccountN" select="AccountName"/>
-                        <xsl:with-param name="AccountT" select="IsGroup"/>
-                    </xsl:apply-templates>
-                </xsl:otherwise>
-            </xsl:choose>
+            <xsl:if test="Permissions/Permission[1]">
+                <!--xsl:apply-templates select="Permissions"/-->
+                <xsl:apply-templates select="Permissions">
+                    <xsl:with-param name="AccountN" select="AccountName"/>
+                    <xsl:with-param name="AccountT" select="IsGroup"/>
+                </xsl:apply-templates>
+            </xsl:if>
             <xsl:if test="count(BasednNames/Item)">
                 <form method="POST" action="/ws_access/PermissionAddInput">
                     <input type="hidden" name="AccountName" value="{AccountName}"/>
@@ -235,13 +231,9 @@
                 </form>
             </xsl:if>
             <p/>
-            <xsl:choose>
-                <xsl:when test="not(GroupPermissions/GroupPermission[1])">
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:apply-templates select="GroupPermissions"/>
-                </xsl:otherwise>
-            </xsl:choose>
+            <xsl:if test="GroupPermissions/GroupPermission[1]">
+                <xsl:apply-templates select="GroupPermissions"/>
+            </xsl:if>
         </body>
         </html>
     </xsl:template>
@@ -267,17 +259,13 @@
             </a>
         </div>
         <span id ="{$groupDivId}" style="display:none; visibility:hidden;">
-            <xsl:choose>
-                <xsl:when test="not(Permissions/Permission[1])">
-                </xsl:when>
-                <xsl:otherwise>
-                    <!--xsl:apply-templates/-->
-                    <xsl:apply-templates select="Permissions">
-                        <xsl:with-param name="AccountN" select="GroupName"/>
-                        <xsl:with-param name="AccountT" select="1"/>
-                    </xsl:apply-templates>
-                </xsl:otherwise>
-            </xsl:choose>
+            <xsl:if test="Permissions/Permission[1]">
+                <!--xsl:apply-templates/-->
+                <xsl:apply-templates select="Permissions">
+                    <xsl:with-param name="AccountN" select="GroupName"/>
+                    <xsl:with-param name="AccountT" select="1"/>
+                </xsl:apply-templates>
+            </xsl:if>
             <xsl:if test="count(BasednNames/Item)">
                 <form method="POST" action="/ws_access/PermissionAddInput">
                     <input type="hidden" name="AccountName" value="{GroupName}"/>

+ 1 - 1
esp/services/ws_access/ws_accessService.cpp

@@ -3147,7 +3147,7 @@ bool Cws_accessEx::onAccountPermissions(IEspContext &context, IEspAccountPermiss
         }
 
         StringArray basednNames;
-        getBaseDNsForAddingPermssionToAccount(ldapsecmgr, NULL, username, 0, basednNames);
+        getBaseDNsForAddingPermssionToAccount(ldapsecmgr, NULL, username, bGroupAccount? 1:0, basednNames);
         if (basednNames.length() > 0)
         {
             resp.setBasednNames(basednNames);