You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/09/18 12:57:14 UTC
svn commit: r1703806 - in /openmeetings:
branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/label/LabelDao.java
trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
Author: solomax
Date: Fri Sep 18 10:57:14 2015
New Revision: 1703806
URL: http://svn.apache.org/viewvc?rev=1703806&view=rev
Log:
[OPENMEETINGS-1253] serch in string labels works as expected
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/label/LabelDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
Modified: openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/label/LabelDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/label/LabelDao.java?rev=1703806&r1=1703805&r2=1703806&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/label/LabelDao.java (original)
+++ openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/label/LabelDao.java Fri Sep 18 10:57:14 2015
@@ -282,7 +282,8 @@ public class LabelDao implements IDataPr
CollectionUtils.filter(result, new Predicate() {
@Override
public boolean evaluate(Object o) {
- return o != null && ((String)o).contains(search);
+ StringLabel sl = (StringLabel)o;
+ return o != null && (sl.getKey().contains(search) || sl.getValue().contains(search));
}
});
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java?rev=1703806&r1=1703805&r2=1703806&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java Fri Sep 18 10:57:14 2015
@@ -284,7 +284,8 @@ public class LabelDao implements IDataPr
CollectionUtils.filter(result, new Predicate() {
@Override
public boolean evaluate(Object o) {
- return o != null && ((String)o).contains(search);
+ StringLabel sl = (StringLabel)o;
+ return o != null && (sl.getKey().contains(search) || sl.getValue().contains(search));
}
});
}