[xwiki-notifications] [Issue] Closed: (XWATCH-78) Filtering keywords with groups does not work

2007-11-13 Thread Jerome Velociter (JIRA) 

 [ 
http://jira.xwiki.org/jira/browse/XWATCH-78?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jerome Velociter closed XWATCH-78.
--

Resolution: Fixed

Applied!

> Filtering keywords with groups does not work
> 
>
> Key: XWATCH-78
> URL: http://jira.xwiki.org/jira/browse/XWATCH-78
> Project: XWiki Watch
>  Issue Type: Bug
>  Components: Filters
>Affects Versions: 1.0M1
>Reporter: Jerome Velociter
> Assigned To: Anca Paula Luca
> Fix For: 1.0M2
>
> Attachments: XWATCH-78.patch
>
>


-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: 
http://jira.xwiki.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira


___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications

[xwiki-notifications] r5860 - xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/data

2007-11-13 Thread SVN 
Author: jvelociter
Date: 2007-11-14 08:48:30 +0100 (Wed, 14 Nov 2007)
New Revision: 5860

Modified:
   
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/data/DataManager.java
Log:
XWATCH-78 Changed hql query for filtering keywords + groups.
Patch submitted by Anca Paula Luca.



Modified: 
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/data/DataManager.java
===
--- 
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/data/DataManager.java
 2007-11-13 23:25:28 UTC (rev 5859)
+++ 
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/data/DataManager.java
 2007-11-14 07:48:30 UTC (rev 5860)
@@ -316,8 +316,10 @@
 if ((feedurl !=null)&&(!feedurl.trim().equals(""))) {
 wheresql += " and feedentry.feedurl='" + 
feedurl.replaceAll("'","''") + "'";
 } else if ((filterStatus.getGroup() 
!=null)&&(!filterStatus.getGroup().trim().equals(""))) {
-wheresql += " and feedentry.feedurl in ("
-+ "select feed.url from XWiki.AggregatorURLClass as feed 
where '" + filterStatus.getGroup().replaceAll("'","''") + "' in 
elements(feed.group))";
+wheresql += "and feedentry.feedurl in (" 
++ "select feed.url from XWiki.AggregatorURLClass as feed, 
BaseObject as obj, " 
++ "XWiki.AggregatorGroupClass as groupProp where obj.name in 
elements(feed.group) " 
++ "and obj.id = groupProp.id and groupProp.name='" + 
filterStatus.getGroup().replaceAll("'", "''") + "')";
 }
 
 if (filterStatus.getDate() !=null) {

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications

[xwiki-notifications] r5859 - xwiki-products/curriki/tags

2007-11-13 Thread SVN 
Author: dward
Date: 2007-11-14 00:25:28 +0100 (Wed, 14 Nov 2007)
New Revision: 5859

Added:
   xwiki-products/curriki/tags/curriki-1.4.0/
Log:
- Tag release of Curriki 1.4.0


Copied: xwiki-products/curriki/tags/curriki-1.4.0 (from rev 5858, 
xwiki-products/curriki/branches/curriki-1.4)

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications

[xwiki-notifications] r5858 - xwiki-products/curriki/branches/curriki-1.4/wiki/src/main/resources/FileCheck

2007-11-13 Thread SVN 
Author: dward
Date: 2007-11-14 00:20:55 +0100 (Wed, 14 Nov 2007)
New Revision: 5858

Modified:
   
xwiki-products/curriki/branches/curriki-1.4/wiki/src/main/resources/FileCheck/WebHome
Log:
- Update 1.4 branch with file from trunk


Modified: 
xwiki-products/curriki/branches/curriki-1.4/wiki/src/main/resources/FileCheck/WebHome
===
--- 
xwiki-products/curriki/branches/curriki-1.4/wiki/src/main/resources/FileCheck/WebHome
   2007-11-13 23:14:24 UTC (rev 5857)
+++ 
xwiki-products/curriki/branches/curriki-1.4/wiki/src/main/resources/FileCheck/WebHome
   2007-11-13 23:20:55 UTC (rev 5858)
@@ -8,18 +8,18 @@
 0
 
 XWiki.LudovicDubost
-XWiki.ShermanTank
+XWiki.LudovicDubost
 
-XWiki.ShermanTank
+XWiki.LudovicDubost
 1194209149000
-1194906144000
-1194906144000
-1.54
+1194994686000
+1194994686000
+1.56
 
 
 
 
-Testing exclusion list.
+Fix qs
 
 
 XWiki.TagClass
@@ -158,18 +158,21 @@
 $itemdoc.display("fcnotes")