You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2017/11/07 15:08:53 UTC
[1/2] allura git commit: Don't error on search_feed if ticket has
unresolvable reporter
Repository: allura
Updated Branches:
refs/heads/master 936319ce3 -> 84c249f0b
Don't error on search_feed if ticket has unresolvable reporter
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/84c249f0
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/84c249f0
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/84c249f0
Branch: refs/heads/master
Commit: 84c249f0bbfb7bc293ea341f7346543a496da1a6
Parents: 433e975
Author: Dave Brondsema <da...@brondsema.net>
Authored: Mon Nov 6 12:50:45 2017 -0500
Committer: Kenton Taylor <kt...@slashdotmedia.com>
Committed: Tue Nov 7 15:08:43 2017 +0000
----------------------------------------------------------------------
ForgeTracker/forgetracker/tracker_main.py | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/84c249f0/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 16888de..a245034 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -874,13 +874,16 @@ class RootController(BaseController, FeedController):
feed = FG.Rss201rev2Feed(**d)
for t in result['tickets']:
url = h.absurl(t.url().encode('utf-8'))
- feed.add_item(title=t.summary,
- link=url,
- pubdate=t.mod_date,
- description=t.description,
- unique_id=url,
- author_name=t.reported_by.display_name,
- author_link=h.absurl(t.reported_by.url()))
+ feed_kwargs = dict(title=t.summary,
+ link=url,
+ pubdate=t.mod_date,
+ description=t.description,
+ unique_id=url,
+ )
+ if t.reported_by:
+ feed_kwargs['author_name'] = t.reported_by.display_name
+ feed_kwargs['author_link'] = h.absurl(t.reported_by.url())
+ feed.add_item(**feed_kwargs)
return feed.writeString('utf-8')
@expose()
[2/2] allura git commit: Avoid errors on ticket search if filter=123
or =foo instead of json dict
Posted by ke...@apache.org.
Avoid errors on ticket search if filter=123 or =foo instead of json dict
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/433e9756
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/433e9756
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/433e9756
Branch: refs/heads/master
Commit: 433e9756b107ff58b8b6aebf48573a0a24c98faa
Parents: 936319c
Author: Dave Brondsema <da...@brondsema.net>
Authored: Mon Nov 6 12:08:25 2017 -0500
Committer: Kenton Taylor <kt...@slashdotmedia.com>
Committed: Tue Nov 7 15:08:43 2017 +0000
----------------------------------------------------------------------
ForgeTracker/forgetracker/tracker_main.py | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/433e9756/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 5fa57ca..16888de 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -722,6 +722,10 @@ class RootController(BaseController, FeedController):
show_deleted = [False, True]
elif deleted and not has_access(c.app, 'delete'):
deleted = False
+
+ if not isinstance(filter, dict):
+ # JsonConverter above can return an int, string, etc, if users give bad inputs, but it needs to be a dict
+ filter = {}
# it's just our original query mangled and sent back to us
kw.pop('q', None)