You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/12/23 13:44:37 UTC
[2/5] allura git commit: [#8024] ticket:871 remove trancate filter
from tool_type column
[#8024] ticket:871 remove trancate filter from tool_type column
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/3cf31535
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/3cf31535
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/3cf31535
Branch: refs/heads/ib/8024
Commit: 3cf31535d14842c1f5f6629ccfa2da63a1cf5057
Parents: 4e95151
Author: Denis Kotov <de...@gmail.com>
Authored: Wed Dec 9 20:38:23 2015 +0200
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed Dec 23 13:56:58 2015 +0200
----------------------------------------------------------------------
Allura/allura/templates/site_admin_site_notifications_list.html | 4 ++--
Allura/allura/tests/functional/test_site_admin.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/3cf31535/Allura/allura/templates/site_admin_site_notifications_list.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_site_notifications_list.html b/Allura/allura/templates/site_admin_site_notifications_list.html
index 5d469a2..7f88e54 100644
--- a/Allura/allura/templates/site_admin_site_notifications_list.html
+++ b/Allura/allura/templates/site_admin_site_notifications_list.html
@@ -32,7 +32,7 @@
<th>Content</th>
<th>User Role</th>
<th>Page Regex</th>
- <th>Page Tool Type</th>
+ <th>Page Type</th>
<th></th>
</tr>
</thead>
@@ -43,7 +43,7 @@
<td><small class="tooltip" title="{{ note.content }}">{{ note.content|truncate(50) }}</small></td>
<td><small>{{ note.user_role if note.user_role}}</small></td>
<td><small class="tooltip" title="{{ note.page_regex }}">{{ note.page_regex|truncate(20) if note.page_regex}}</small></td>
- <td><small class="tooltip" title="{{ note.page_tool_type }}">{{ note.page_tool_type|truncate(20) if note.page_tool_type}}</small></td>
+ <td><small>{{ note.page_tool_type if note.page_tool_type}}</small></td>
<td>
<a href="">Edit</a><br>
<a href="">Delete</a>
http://git-wip-us.apache.org/repos/asf/allura/blob/3cf31535/Allura/allura/tests/functional/test_site_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_site_admin.py b/Allura/allura/tests/functional/test_site_admin.py
index ad44be3..6b4187f 100644
--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -197,7 +197,7 @@ class TestSiteAdmin(TestController):
assert headers[2].contents[0] == 'Content'
assert headers[3].contents[0] == 'User Role'
assert headers[4].contents[0] == 'Page Regex'
- assert headers[5].contents[0] == 'Page Tool Type'
+ assert headers[5].contents[0] == 'Page Type'
assert row[0].contents[0].contents[0] == 'True'
assert row[1].contents[0].contents[0] == '0'