Author: astaric
Date: Sun Mar 2 06:52:21 2014
New Revision: 1573264
URL: http://svn.apache.org/r1573264
Log:
Use get to access product in search documents. Refs: #773
Modified:
bloodhound/trunk/bloodhound_search/bhsearch/search_resources/milestone_search.py
bloodhound/trunk/bloodhound_search/bhsearch/search_resources/ticket_search.py
bloodhound/trunk/bloodhound_search/bhsearch/search_resources/wiki_search.py
bloodhound/trunk/bloodhound_search/bhsearch/security.py
bloodhound/trunk/bloodhound_search/bhsearch/web_ui.py
Modified:
bloodhound/trunk/bloodhound_search/bhsearch/search_resources/milestone_search.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/milestone_search.py?rev=1573264&r1=1573263&r2=1573264&view=diff
==============================================================================
---
bloodhound/trunk/bloodhound_search/bhsearch/search_resources/milestone_search.py
(original)
+++
bloodhound/trunk/bloodhound_search/bhsearch/search_resources/milestone_search.py
Sun Mar 2 06:52:21 2014
@@ -171,4 +171,8 @@ class MilestoneSearchParticipant(BaseSea
#TODO: add better milestone rendering
name = res['hilited_name'] or res['name']
- return tag(u'[', res['product'], u'] Milestone:', name)
+ product = res.get('product')
+ if product:
+ return tag(u'[', product, u'] Milestone:', name)
+ else:
+ return tag(u'Milestone:', name)
Modified:
bloodhound/trunk/bloodhound_search/bhsearch/search_resources/ticket_search.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/ticket_search.py?rev=1573264&r1=1573263&r2=1573264&view=diff
==============================================================================
---
bloodhound/trunk/bloodhound_search/bhsearch/search_resources/ticket_search.py
(original)
+++
bloodhound/trunk/bloodhound_search/bhsearch/search_resources/ticket_search.py
Sun Mar 2 06:52:21 2014
@@ -248,6 +248,10 @@ class TicketSearchParticipant(BaseSearch
stat = res[TicketFields.STATUS]
id = res['hilited_id'] or res['id']
- id = tag.span('#', id, class_=css_class)
+ id = tag.span(u'#', id, class_=css_class)
summary = res['hilited_summary'] or res['summary']
- return tag('[', res['product'], '] ', id, ': ', summary, ' (%s)' %
stat)
+ product = res.get('product')
+ if product:
+ return tag(u'[', product, u'] ', id, u': ', summary, u' (%s)' %
stat)
+ else:
+ return tag(id, u': ', summary, u' (%s)' % stat)
Modified:
bloodhound/trunk/bloodhound_search/bhsearch/search_resources/wiki_search.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/wiki_search.py?rev=1573264&r1=1573263&r2=1573264&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/search_resources/wiki_search.py
(original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/search_resources/wiki_search.py
Sun Mar 2 06:52:21 2014
@@ -161,4 +161,8 @@ class WikiSearchParticipant(BaseSearchPa
def format_search_results(self, res):
title = res['hilited_name'] or res['name']
- return tag('[', res['product'], '] ', title)
+ product = res.get('product')
+ if product:
+ return tag(u'[', product, u'] ', title)
+ else:
+ return tag(title)
Modified: bloodhound/trunk/bloodhound_search/bhsearch/security.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/security.py?rev=1573264&r1=1573263&r2=1573264&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/security.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/security.py Sun Mar 2 06:52:21
2014
@@ -42,7 +42,7 @@ class SecurityPreprocessor(Component):
self._required_permissions[doc_type] = permission
def check_permission(self, doc, context):
- product, doctype, id = doc['product'], doc['type'], doc['id']
+ product, doctype, id = doc.get('product'), doc['type'], doc['id']
username = context.req.authname
env = self.env
if product:
Modified: bloodhound/trunk/bloodhound_search/bhsearch/web_ui.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/web_ui.py?rev=1573264&r1=1573263&r2=1573264&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/web_ui.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/web_ui.py Sun Mar 2 06:52:21
2014
@@ -697,7 +697,7 @@ class RequestContext(object):
def _process_doc(self, doc):
ui_doc = dict(doc)
- if doc['product']:
+ if doc.get('product'):
env = ProductEnvironment(self.env, doc['product'])
product_href = ProductEnvironment.resolve_href(env, self.env)
# pylint: disable=too-many-function-args
