Commit: 34b11ad3357c4ee79b84ebf5b79329606430a4d0 - allura (git)

allura

Commit MetaInfo

• Revision: 34b11ad3357c4ee79b84ebf5b79329606430a4d0 (tree)
• Zeit: 2012-04-19 00:29:19
• Autor: bolkimen <bolkimen@yaho...>
• Commiter: bolkimen

Log Message

ticket:39 add my_projects macro

Ändern Zusammenfassung

• modified: Allura/allura/lib/macro.py
• modified: Allura/allura/model/project.py
• modified: Allura/allura/tests/test_globals.py

Diff

--- a/Allura/allura/lib/macro.py
+++ b/Allura/allura/lib/macro.py
@@ -132,10 +132,9 @@ def project_blog_posts(max_number=5, sort='timestamp', summary=False, mount_poin
                              security.has_access(post.app.project, 'read', project=post.app.project)())
     return output
 
-@macro('neighborhood-wiki')
-def projects(category=None, display_mode='grid', sort='last_updated',
+def get_projects_for_macro(category=None, display_mode='grid', sort='last_updated',
         show_total=False, limit=100, labels='', award='', private=False,
-        columns=1, show_proj_icon=True, show_download_button=True):
+        columns=1, show_proj_icon=True, show_download_button=True, macro_type='projects'):
     from allura.lib.widgets.project_list import ProjectList
     from allura.lib import utils
     from allura import model as M
@@ -172,37 +171,77 @@ def projects(category=None, display_mode='grid', sort='last_updated',
     elif sort == '_id':
         sort_key, sort_dir = '_id', pymongo.DESCENDING
 
-    projects = []
-    if private:
-        # Only return private projects.
-        # Can't filter these with a mongo query directly - have to iterate
-        # through and check the ACL of each project.
-        for chunk in utils.chunked_find(M.Project, q, sort_key=sort_key,
-                sort_dir=sort_dir):
-            projects.extend([p for p in chunk if p.private])
-        total = len(projects)
-        if sort == 'random':
-            projects = random.sample(projects, min(limit, total))
+    if macro_type == 'projects':
+        projects = []
+        if private:
+            # Only return private projects.
+            # Can't filter these with a mongo query directly - have to iterate
+            # through and check the ACL of each project.
+            for chunk in utils.chunked_find(M.Project, q, sort_key=sort_key,
+                    sort_dir=sort_dir):
+                projects.extend([p for p in chunk if p.private])
+            total = len(projects)
+            if sort == 'random':
+                projects = random.sample(projects, min(limit, total))
+            else:
+                projects = projects[:limit]
         else:
-            projects = projects[:limit]
-    else:
-        total = None
+            total = None
+            if sort == 'random':
+                # MongoDB doesn't have a random sort built in, so...
+                # 1. Do a direct pymongo query (faster than ORM) to fetch just the
+                #    _ids of objects that match our criteria
+                # 2. Choose a random sample of those _ids
+                # 3. Do an ORM query to fetch the objects with those _ids
+                # 4. Shuffle the results
+                from ming.orm import mapper
+                m = mapper(M.Project)
+                collection = M.main_doc_session.db[m.collection.m.collection_name]
+                docs = list(collection.find(q, {'_id': 1}))
+                if docs:
+                    ids = [doc['_id'] for doc in
+                            random.sample(docs, min(limit, len(docs)))]
+                    if '_id' in q:
+                        ids = list(set(q['_id']['$in']).intersection(ids))
+                    q['_id'] = {'$in': ids}
+                    projects = M.Project.query.find(q).all()
+                    random.shuffle(projects)
+            else:
+                projects = M.Project.query.find(q).limit(limit).sort(sort_key,
+                    sort_dir).all()
+
+    elif macro_type == 'my_projects':
+        projects = []
+        myproj_user = c.user.anonymous()
+
+        if c.project.neighborhood.name == "Users" and c.project.name[:2] == u"u/":
+            username = c.project.name[2:]
+            myproj_user = M.User.query.get(username=username)
+            if 'neighborhood_id' in q:
+                del q['neighborhood_id']
+        else:
+            admin_role_id = M.ProjectRole.query.get(project_id=c.project._id,name='Admin')._id
+            if c.user is None or c.user == c.user.anonymous():
+                project_users_roles = M.ProjectRole.query.find(dict(name=None, project_id=c.project._id)).all()
+                for ur in project_users_roles:
+                    if admin_role_id in ur.roles:
+                        myproj_user = ur.user
+                        break
+            else:
+                myproj_user = c.user
+
+        # Get projects ids
+        ids = []
+        for p in myproj_user.my_projects():
+            ids.append(p._id)
+        if '_id' in q:
+            ids = list(set(q['_id']['$in']).intersection(ids))
+        q['_id'] = {'$in': ids}
+
         if sort == 'random':
-            # MongoDB doesn't have a random sort built in, so...
-            # 1. Do a direct pymongo query (faster than ORM) to fetch just the
-            #    _ids of objects that match our criteria
-            # 2. Choose a random sample of those _ids
-            # 3. Do an ORM query to fetch the objects with those _ids
-            # 4. Shuffle the results
-            from ming.orm import mapper
-            m = mapper(M.Project)
-            collection = M.main_doc_session.db[m.collection.m.collection_name]
-            docs = list(collection.find(q, {'_id': 1}))
-            if docs:
-                ids = [doc['_id'] for doc in
-                        random.sample(docs, min(limit, len(docs)))]
-                projects = M.Project.query.find(dict(_id={'$in': ids})).all()
-                random.shuffle(projects)
+            ids = random.sample(ids, min(limit, len(ids)))
+            projects = M.Project.query.find(q).all()
+            random.shuffle(projects)
         else:
             projects = M.Project.query.find(q).limit(limit).sort(sort_key,
                 sort_dir).all()
@@ -222,6 +261,25 @@ def projects(category=None, display_mode='grid', sort='last_updated',
                 (total, response)
     return response
 
+
+@macro('neighborhood-wiki')
+def projects(category=None, display_mode='grid', sort='last_updated',
+        show_total=False, limit=100, labels='', award='', private=False,
+        columns=1, show_proj_icon=True, show_download_button=True):
+    return get_projects_for_macro(category=category, display_mode=display_mode, sort=sort, 
+                   show_total=show_total, limit=limit, labels=labels, award=award, private=private,
+                   columns=columns, show_proj_icon=show_proj_icon, show_download_button=show_download_button,
+                   macro_type='projects')
+
+@macro()
+def my_projects(category=None, display_mode='grid', sort='last_updated',
+        show_total=False, limit=100, labels='', award='', private=False,
+        columns=1, show_proj_icon=True, show_download_button=True):
+    return get_projects_for_macro(category=category, display_mode=display_mode, sort=sort, 
+                   show_total=show_total, limit=limit, labels=labels, award=award, private=private,
+                   columns=columns, show_proj_icon=show_proj_icon, show_download_button=show_download_button,
+                   macro_type='my_projects')
+
 @macro()
 def project_screenshots():
     from allura.lib.widgets.project_list import ProjectScreenshots

--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -309,7 +309,7 @@ class Project(MappedClass):
         roles = set()
         for p in self.parent_iter():
             for ace in p.acl:
-                if ace.permission == name and ace.access == ACE.alllow:
+                if ace.permission == name and ace.access == ACE.allow:
                     roles.add(ace.role_id)
         return list(roles)
 

--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -226,6 +226,23 @@ def test_projects_macro():
         r = g.markdown_wiki.convert('[[projects display_mode=list show_download_button=False]]')
         assert 'download-button' not in r
 
+@with_setup(setUp)
+def test_myprojects_macro():
+    h.set_context('test', 'wiki', neighborhood='Projects')
+
+    r = g.markdown_wiki.convert('[[my_projects]]')
+    for p in c.user.my_projects():
+        if p.neighborhood.name == 'Projects':
+            proj_title = '<h2><a href="%s">%s</a></h2>' % (p.url(), p.name)
+            assert proj_title in r
+
+    h.set_context('u/test-user-1', 'wiki', neighborhood='Users')
+    user = M.User.query.get(username='test-user-1')
+    r = g.markdown_wiki.convert('[[my_projects]]')
+    for p in user.my_projects():
+        proj_title = '<h2><a href="%s">%s</a></h2>' % (p.url(), p.name)
+        assert proj_title in r
+
 def get_project_names(r):
     """
     Extracts a list of project names from a wiki page HTML.