oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support group by in newsfeed follows

Browse source
This commit is contained in:
shortcutme 2016-08-20 10:39:15 +02:00
parent 3049e489fb
commit 0f51826d9d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/Newsfeed/NewsfeedPlugin.py
View file

@ -1,4 +1,5 @@
import time import time
import re
from Plugin import PluginManager from Plugin import PluginManager
from Db import DbQuery from Db import DbQuery
@ -34,8 +35,7 @@ class UiWebsocketPlugin(object):
db_query = DbQuery(query_part) db_query = DbQuery(query_part)
where = " WHERE %s > strftime('%%s', 'now', '-3 day')" % db_query.fields.get("date_added", "date_added") where = " WHERE %s > strftime('%%s', 'now', '-3 day')" % db_query.fields.get("date_added", "date_added")
if "WHERE" in query_part: if "WHERE" in query_part:
query_part = query_part.replace("WHERE ", where+" AND (") query_part = re.sub("WHERE (.*?)(?=$| GROUP BY)", where+" AND (\\1)", query_part)
query_part += ") "
else: else:
query_part += where query_part += where
query_parts[i] = query_part query_parts[i] = query_part