Commits

Olemis Lang committed a0c8d04

BH Multiproduct #576 : Realm/id decoration in report

Comments (0)

Files changed (3)

 t577/t577_r1496958_newticket_id.diff
 t387/t387_r149918_global_timeline.diff
 t387/t387_r149918_global_attachments.diff
+t576/t576_r1495238_report_id_col.diff
 t387/t387_r1495238_functional_test.2.diff

t387/t387_r1495238_functional_test.2.diff

 # HG changeset patch
-# Parent 173d619460b32b034b63f80f4ea97803e855c098
+# Parent 09b6a1d5f5862ec8746884b3b544ee525428a6e0
 BH Multiproduct #387 : Bloodhound functional test cases (cont.)
 
-diff -r 173d619460b3 bloodhound_multiproduct/tests/functional/__init__.py
---- a/bloodhound_multiproduct/tests/functional/__init__.py	Wed Jul 03 20:17:09 2013 -0500
-+++ b/bloodhound_multiproduct/tests/functional/__init__.py	Wed Jul 03 21:00:13 2013 -0500
+diff -r 09b6a1d5f586 bloodhound_multiproduct/tests/functional/__init__.py
+--- a/bloodhound_multiproduct/tests/functional/__init__.py	Thu Jul 04 17:26:03 2013 -0500
++++ b/bloodhound_multiproduct/tests/functional/__init__.py	Thu Jul 04 18:08:52 2013 -0500
 @@ -333,7 +333,13 @@
  
      - Preferences link removed in Bloodhound UI
      # The db tests should be last since the backup test occurs there.
      import trac.db.tests
      trac.db.tests.functionalSuite(suite)
-diff -r 173d619460b3 bloodhound_multiproduct/tests/functional/ticket.py
---- a/bloodhound_multiproduct/tests/functional/ticket.py	Wed Jul 03 20:17:09 2013 -0500
-+++ b/bloodhound_multiproduct/tests/functional/ticket.py	Wed Jul 03 21:00:13 2013 -0500
+diff -r 09b6a1d5f586 bloodhound_multiproduct/tests/functional/ticket.py
+--- a/bloodhound_multiproduct/tests/functional/ticket.py	Thu Jul 04 17:26:03 2013 -0500
++++ b/bloodhound_multiproduct/tests/functional/ticket.py	Thu Jul 04 18:08:52 2013 -0500
 @@ -24,6 +24,8 @@
  
  from trac.ticket.tests.functional import *
 +        self._tester.go_to_front()
 +
 +        # [BLOODHOUND] New Ticket => More fields (in create ticket menu)
-+        self.go_to_newticket()
++        self._tester.go_to_newticket()
 +
 +        tc.find('Create New Ticket')
 +

t576/t576_r1495238_report_id_col.diff

+# HG changeset patch
+# Parent 31222635eb4658dc6c2d3cb2f2ff07afde88e224
+BH Dashboard #576 : Realm/id decoration in grids
+
+diff -r 31222635eb46 bloodhound_dashboard/bhdashboard/widgets/templates/widget_grid.html
+--- a/bloodhound_dashboard/bhdashboard/widgets/templates/widget_grid.html	Thu Jul 04 18:36:59 2013 -0500
++++ b/bloodhound_dashboard/bhdashboard/widgets/templates/widget_grid.html	Thu Jul 04 19:08:16 2013 -0500
+@@ -92,7 +92,7 @@
+                       <!--! for the ticket listing -->
+                       <py:when test="col in ('ticket', 'id')">
+                         <td class="ticket" py:attrs="td_attrs">
+-                          <a title="View ${row.resource.realm}" href="$row.href">#$cell.value</a>
++                          <a title="View ${row.resource.realm}" href="${row.href if row.href else url_of(row.resource)}">${shortname_of(row.resource)}</a>
+                         </td>
+                       </py:when>
+