allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jetm...@apache.org
Subject [1/9] allura git commit: [#8024] ticket:871 remove trancate filter from tool_type column
Date Fri, 08 Jan 2016 10:43:11 GMT
Repository: allura
Updated Branches:
  refs/heads/ib/8024a [created] f77e85838


[#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/f3cac272
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/f3cac272
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/f3cac272

Branch: refs/heads/ib/8024a
Commit: f3cac2727ee458c77b860254391d3723193d8d28
Parents: 76e72e5
Author: Denis Kotov <deniskkotov@gmail.com>
Authored: Wed Dec 9 20:38:23 2015 +0200
Committer: Denis Kotov <deniskkotov@gmail.com>
Committed: Thu Jan 7 21:41:20 2016 +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/f3cac272/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/f3cac272/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