allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [03/10] allura git commit: [#8024] ticket:871 remove trancate filter from tool_type column
Date Fri, 08 Jan 2016 18:02:33 GMT
[#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/ea39da6a
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/ea39da6a
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/ea39da6a

Branch: refs/heads/master
Commit: ea39da6a5ae595837ad926e7cd3244f4dff8b3e4
Parents: de3cd01
Author: Denis Kotov <deniskkotov@gmail.com>
Authored: Wed Dec 9 20:38:23 2015 +0200
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Fri Jan 8 12:18:11 2016 -0500

----------------------------------------------------------------------
 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/ea39da6a/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/ea39da6a/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'


Mime
View raw message