提交: 7d983c45fc37bf55b47172023c681dbf081caa88 - allura (git)

allura

Commit MetaInfo

• 修訂: 7d983c45fc37bf55b47172023c681dbf081caa88 (tree)
• 時間: 2012-07-17 19:09:48
• 作者: Igor Bondarenko <jetmind2@gmai...>
• Commiter: Igor Bondarenko

Log Message

[#4528] ticket:120 omit deleted projects in my_projects plus test

Change Summary

• modified: Allura/allura/ext/user_profile/templates/user_index.html
• modified: Allura/allura/model/auth.py
• modified: Allura/allura/tests/model/test_auth.py

差異

--- a/Allura/allura/ext/user_profile/templates/user_index.html
+++ b/Allura/allura/ext/user_profile/templates/user_index.html
@@ -25,7 +25,7 @@
   <div class="project-list grid-18">
     <b>Projects</b>
     <ul>
-      {% for p in user.my_projects(exclude_deleted=True) %}
+      {% for p in user.my_projects() %}
         {% if h.has_access(p, 'read')() %}
           <li>
               <a class="project-name" href="{{p.url()}}">{{p.name}}</a>

--- a/Allura/allura/model/auth.py
+++ b/Allura/allura/model/auth.py
@@ -429,17 +429,16 @@ class User(MappedClass, ActivityNode, ActivityObject):
     def script_name(self):
         return '/u/' + self.username + '/'
 
-    def my_projects(self, exclude_deleted=False):
+    def my_projects(self):
         '''Find the projects for which this user has a named role.'''
         reaching_role_ids = g.credentials.user_roles(user_id=self._id).reaching_ids_set
         reaching_roles = [ ProjectRole.query.get(_id=i) for i in reaching_role_ids ]
-        named_roles = [ r for r in reaching_roles if r.name ]
+        named_roles = [ r for r in reaching_roles
+                                if r.name and not r.project.deleted ]
         seen_project_ids = set()
         for r in named_roles:
             if r.project_id in seen_project_ids: continue
             seen_project_ids.add(r.project_id)
-            if exclude_deleted and r.project.deleted:
-                continue
             yield r.project
 
     def project_role(self, project=None):

--- a/Allura/allura/tests/model/test_auth.py
+++ b/Allura/allura/tests/model/test_auth.py
@@ -64,6 +64,10 @@ def test_user():
     assert c.user.url() .endswith('/u/test-admin/')
     assert c.user.script_name .endswith('/u/test-admin/')
     assert set(p.shortname for p in c.user.my_projects()) == set(['test', 'test2', 'u/test-admin', 'adobe-1', '--init--'])
+    # delete one of projects and make sure it's don't appear in my_projects()
+    p = M.Project.query.get(shortname='test2')
+    p.deleted = True
+    assert set(p.shortname for p in c.user.my_projects()) == set(['test', 'u/test-admin', 'adobe-1', '--init--'])
     assert M.User.anonymous().project_role().name == '*anonymous'
     u = M.User.register(dict(
             username='nosetest-user'))