授权页面bug fn:contains 是通过字符串包含比较的而不是集合操作

nalan1976 · Oct 19, 2013 · 7a69bbf · 7a69bbf
1 parent 5895f3c
commit 7a69bbf
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/web/src/main/java/com/sishuok/es/extra/web/taglib/EsFunctions.java b/web/src/main/java/com/sishuok/es/extra/web/taglib/EsFunctions.java
@@ -17,6 +17,8 @@
 import com.sishuok.es.sys.resource.entity.Resource;
 import com.sishuok.es.sys.resource.service.ResourceService;
 
+import java.util.Iterator;
+
 /**
  * 提供el中可以使用的一些函数
  * <p>User: Zhang Kaitao
@@ -25,6 +27,21 @@
  */
 public class EsFunctions {
 
+
+    public static boolean in(Iterable iterable, Object obj) {
+        if(iterable == null) {
+            return false;
+        }
+        Iterator iterator = iterable.iterator();
+
+        while(iterator.hasNext()) {
+            if(iterator.next().equals(obj)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * 判断是否存储指定id的组织机构
      *

diff --git a/web/src/main/webapp/WEB-INF/jsp/admin/sys/auth/editForm.jsp b/web/src/main/webapp/WEB-INF/jsp/admin/sys/auth/editForm.jsp
@@ -181,7 +181,7 @@
                         <div class="list">
                             <ul>
                                 <c:forEach items="${roles}" var="r">
-                                    <c:if test="${not fn:contains(m.roleIds, r.id)}">
+                                    <c:if test="${not esfn:in(m.roleIds, r.id)}">
                                         <li class="ui-state-default" data-value="${r.id}" title="${r.description}">
                                             ${r.name}[${r.role}]
                                         </li>
@@ -203,7 +203,7 @@
                         <div class="list">
                             <ul data-input-id="roleIds">
                                 <c:forEach items="${roles}" var="r">
-                                    <c:if test="${fn:contains(m.roleIds, r.id)}">
+                                    <c:if test="${esfn:in(m.roleIds, r.id)}">
                                         <li class="ui-state-default" data-value="${r.id}" title="${r.description}">
                                             ${r.name}[${r.role}]
                                         </li>

diff --git a/web/src/main/webapp/WEB-INF/jsp/showcase/sample/editForm.jsp b/web/src/main/webapp/WEB-INF/jsp/showcase/sample/editForm.jsp
@@ -72,7 +72,7 @@
             </div>
 
             <div class="control-group">
-                <form:label path="birthday" cssClass="control-label">出生日期</form:label>
+                <form:label path="totalDays" cssClass="control-label">出生日期</form:label>
                 <div class="controls input-append date">
                     <form:input path="birthday" data-format="yyyy-MM-dd hh:mm:ss" placeholder="例如2013-02-07 11:58:11"/>
                     <span class="add-on"><i data-time-icon="icon-time" data-date-icon="icon-calendar"></i></span>

diff --git a/web/src/main/webapp/WEB-INF/tld/es-functions.tld b/web/src/main/webapp/WEB-INF/tld/es-functions.tld
@@ -8,6 +8,13 @@
     <short-name>esfn</short-name>
     <uri>http://www.sishuok.com/tags/es-functions</uri>
 
+    <function>
+        <description>obj in collection</description>
+        <name>in</name>
+        <function-class>com.sishuok.es.extra.web.taglib.EsFunctions</function-class>
+        <function-signature>boolean in(java.lang.Iterable,java.lang.Object)</function-signature>
+    </function>
+
     <function>
         <description>判断指定id的组织机构是否存在，第一个参数是id，第二个参数是onlyDisplayShow(是否仅显示可见的)</description>
         <name>existsOrganization</name>