incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [5/6] git commit: [#5481] Removed email address from new members page
Date Fri, 12 Apr 2013 21:16:35 GMT
[#5481] Removed email address from new members page

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/5fe1e8ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/5fe1e8ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/5fe1e8ce

Branch: refs/heads/cj/5481
Commit: 5fe1e8ced441529c0d2fb41d60ce359a7fdde01b
Parents: 3d4b710
Author: Cory Johns <cjohns@slashdotmedia.com>
Authored: Fri Apr 12 17:51:49 2013 +0000
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Fri Apr 12 17:51:49 2013 +0000

----------------------------------------------------------------------
 Allura/allura/controllers/project.py        |    2 +-
 Allura/allura/templates/members.html        |    6 ++----
 Allura/allura/tests/functional/test_home.py |    5 ++---
 3 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5fe1e8ce/Allura/allura/controllers/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index 6a05acf..9a72f4c 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -329,7 +329,7 @@ class ProjectController(object):
                 username=user.username,
                 url=user.url(),
                 roles=roles,
-                email_addresses=user.email_addresses))
+                ))
         return dict(users=users)
 
     def _check_security(self):

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5fe1e8ce/Allura/allura/templates/members.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/members.html b/Allura/allura/templates/members.html
index 468d14c..f709d78 100644
--- a/Allura/allura/templates/members.html
+++ b/Allura/allura/templates/members.html
@@ -11,18 +11,16 @@
         <th>Developer</th>
         <th>Username</th>
         <th>Role/Position</th>
-        <th>Email</th>
     </tr>
     </thead>
     {%for user in users%}
     <tr>
         <td>{{ user.display_name }}</td>
         <td><a href="{{ user.url }}">{{ user.username }}</a></td>
-        <td>{% for role in user.roles%} {{ role }}</br> {%endfor%}</td>
-        <td>{% for email in user.email_addresses %}{{email.replace('@', ' at ')}}{%endfor%}</td>
+        <td>{{user.roles|join(', ')}}</td>
     </tr>
     {%endfor%}
 </table>
 </div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5fe1e8ce/Allura/allura/tests/functional/test_home.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_home.py b/Allura/allura/tests/functional/test_home.py
index a4f2f84..79128b6 100644
--- a/Allura/allura/tests/functional/test_home.py
+++ b/Allura/allura/tests/functional/test_home.py
@@ -61,12 +61,11 @@ class TestProjectHome(TestController):
         r = self.app.get('/p/test/_members/')
         assert '<td>Test Admin</td>' in r
         assert '<td><a href="/u/test-admin/">test-admin</a></td>'
in r
-        assert '<td> Admin</br> </td>' in r
-        assert '<td>test-admin at users.localhost</td>' in r
+        assert '<td>Admin</td>' in r
 
     def test_members_anonymous(self):
         r = self.app.get('/p/test/_members/', extra_environ=dict(username='*anonymous'))
         assert '<td>Test Admin</td>' in r
         assert '<td><a href="/u/test-admin/">test-admin</a></td>'
in r
-        assert '<td> Admin</br> </td>' in r
+        assert '<td>Admin</td>' in r
 


Mime
View raw message