You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bloodhound.apache.org by gj...@apache.org on 2012/04/01 03:21:40 UTC
svn commit: r1307980 - in
/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard: web_ui.py
widgets/query.py widgets/report.py
Author: gjm
Date: Sun Apr 1 01:21:39 2012
New Revision: 1307980
URL: http://svn.apache.org/viewvc?rev=1307980&view=rev
Log:
Dashboard code import: BH_Dashboard: Hiding download icon for query widget in dashboard
Modified:
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/query.py
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/report.py
Modified: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py?rev=1307980&r1=1307979&r2=1307980&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py (original)
+++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py Sun Apr 1 01:21:39 2012
@@ -24,6 +24,7 @@ r"""Project dashboard for Apache(TM) Blo
Implementing dashboard user interface.
"""
+from itertools import izip
import pkg_resources
import re
@@ -124,7 +125,8 @@ class DashboardModule(Component):
{'args' : {'max' : 10,
'query' : dashboard_query,
'title' : 'Dashboard'}
- }]
+ }],
+ 'altlinks' : False
},
{
'c' : TimelineWidget(self.env),
@@ -143,7 +145,7 @@ class DashboardModule(Component):
data_strm = (w['c'].render_widget(*w['args']) for w in widgets_spec)
return [{'title' : data['title'],
'content' : render(wctx.req, template, data['data'], fragment=True),
- 'ctxtnav' : data.get('ctxtnav'),
- 'altlinks' : data.get('altlinks')} \
- for template, data, wctx in data_strm]
+ 'ctxtnav' : w.get('ctxtnav', True) and data.get('ctxtnav') or None,
+ 'altlinks' : w.get('altlinks', True) and data.get('altlinks') or None} \
+ for w, (template, data, wctx) in izip(widgets_spec, data_strm)]
Modified: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/query.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/query.py?rev=1307980&r1=1307979&r2=1307980&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/query.py (original)
+++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/query.py Sun Apr 1 01:21:39 2012
@@ -96,7 +96,6 @@ class TicketQueryWidget(WidgetBase):
exc.title = data.get('title', 'TracQuery')
raise
else:
- merge_links(srcreq=fakereq, dstreq=req)
qryctx = Context.from_request(fakereq)
query = data['query']
idxs = count()
Modified: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/report.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/report.py?rev=1307980&r1=1307979&r2=1307980&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/report.py (original)
+++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/report.py Sun Apr 1 01:21:39 2012
@@ -95,7 +95,6 @@ class TicketReportWidget(WidgetBase):
exc.title = data.get('title', 'TracReports')
raise
else:
- merge_links(srcreq=fakereq, dstreq=req)
title = data.get('title', '%s {%s}' % (_('Report'), rptid))
rptctx = Context.from_request(fakereq, 'report', rptid)
return 'widget_grid.html', \