提交: aede6f33cf54dc8aef2233f0992675c88bfab694 - allura (git)

allura

Commit MetaInfo

• 修訂: aede6f33cf54dc8aef2233f0992675c88bfab694 (tree)
• 時間: 2012-04-18 05:14:17
• 作者: bolkimen <bolkimen@yaho...>
• Commiter: Dave Brondsema

Log Message

ticket:17 add admin list

Change Summary

• modified: Allura/allura/ext/admin/admin_main.py
• modified: Allura/allura/ext/admin/templates/project_stats.html
• add: Allura/allura/ext/admin/templates/project_stats_adminlist.html

差異

--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -45,6 +45,7 @@ class W:
     screenshot_list = ProjectScreenshots()
     metadata_admin = aw.MetadataAdmin()
     audit = aw.AuditLog()
+    page_list=ffw.PageList()
 
 class AdminWidgets(WidgetController):
     widgets=['users', 'tool_status']
@@ -163,6 +164,7 @@ class ProjectAdminController(BaseController):
         self.permissions = PermissionsController()
         self.groups = GroupsController()
         self.audit = AuditController()
+        self.stats = StatsController()
 
     @with_trailing_slash
     @expose('jinja:allura.ext.admin:templates/project_admin.html')
@@ -215,47 +217,6 @@ class ProjectAdminController(BaseController):
             roles=M.ProjectRole.query.find(dict(project_id=c.project.root_project._id)).sort('_id').all(),
             categories=M.ProjectCategory.query.find(dict(parent_id=None)).sort('label').all())
 
-    @without_trailing_slash
-    @expose('jinja:allura.ext.admin:templates/project_stats.html')
-    def stats(self, **kw):
-        if c.project.shortname != '--init--':
-             redirect('index')
-        
-        # public private deleted
-        delete_count = M.Project.query.find(dict(neighborhood_id=c.project.neighborhood._id, deleted=True)).count()
-        public_count = 0
-        private_count = 0
-        last_updated_30 = 0
-        last_updated_60 = 0
-        last_updated_90 = 0
-        today_date = datetime.today()
-        for p in M.Project.query.find(dict(neighborhood_id=c.project.neighborhood._id, deleted=False)).all():
-             if p.private:
-                 private_count = private_count + 1
-             else:
-                 public_count = public_count + 1
-                 if today_date - p.last_updated < timedelta(days=30):
-                     last_updated_30 = last_updated_30 + 1
-                 if today_date - p.last_updated < timedelta(days=60):
-                     last_updated_60 = last_updated_60 + 1
-                 if today_date - p.last_updated < timedelta(days=90):
-                     last_updated_90 = last_updated_90 + 1
-
-        c.delete_count = delete_count
-        c.public_count = public_count
-        c.private_count = private_count
-        c.last_updated_30 = last_updated_30
-        c.last_updated_60 = last_updated_60
-        c.last_updated_90 = last_updated_90
-
-        c.markdown_editor = W.markdown_editor
-        c.label_edit = W.label_edit
-        c.mount_delete = W.mount_delete
-        c.admin_modal = W.admin_modal
-        c.install_modal = W.install_modal
-        mounts = c.project.ordered_mounts()
-        return dict()
-
     @expose()
     @require_post()
     def update_labels(self, labels=None, labels_old=None, **kw):
@@ -772,6 +733,80 @@ class AuditController(BaseController):
             page=page,
             count=count)
 
+class StatsController(BaseController):
+
+    def _check_security(self):
+        require_access(c.project, 'admin')
+
+    @without_trailing_slash
+    @expose('jinja:allura.ext.admin:templates/project_stats.html')
+    def index(self, **kw):
+        if c.project.shortname != '--init--':
+             redirect('index')
+        
+        # public private deleted
+        delete_count = M.Project.query.find(dict(neighborhood_id=c.project.neighborhood._id, deleted=True)).count()
+        public_count = 0
+        private_count = 0
+        last_updated_30 = 0
+        last_updated_60 = 0
+        last_updated_90 = 0
+        today_date = datetime.today()
+        for p in M.Project.query.find(dict(neighborhood_id=c.project.neighborhood._id, deleted=False)).all():
+             if p.private:
+                 private_count = private_count + 1
+             else:
+                 public_count = public_count + 1
+                 if today_date - p.last_updated < timedelta(days=30):
+                     last_updated_30 = last_updated_30 + 1
+                 if today_date - p.last_updated < timedelta(days=60):
+                     last_updated_60 = last_updated_60 + 1
+                 if today_date - p.last_updated < timedelta(days=90):
+                     last_updated_90 = last_updated_90 + 1
+
+        c.delete_count = delete_count
+        c.public_count = public_count
+        c.private_count = private_count
+        c.last_updated_30 = last_updated_30
+        c.last_updated_60 = last_updated_60
+        c.last_updated_90 = last_updated_90
+
+        c.markdown_editor = W.markdown_editor
+        c.label_edit = W.label_edit
+        c.mount_delete = W.mount_delete
+        c.admin_modal = W.admin_modal
+        c.install_modal = W.install_modal
+        mounts = c.project.ordered_mounts()
+        return dict()
+
+    @without_trailing_slash
+    @expose('jinja:allura.ext.admin:templates/project_stats_adminlist.html')
+    def adminlist(self, sort='alpha', limit=25, page=0, **kw):
+        limit, page, start = g.handle_paging(limit, page)
+
+        pq = M.Project.query.find(dict(neighborhood_id=c.project.neighborhood._id, deleted=False))
+        if sort=='alpha':
+            pq.sort('name')
+        else:
+            pq.sort('last_updated', pymongo.DESCENDING)
+        count = pq.count()
+        projects = pq.skip(start).limit(int(limit)).all()
+
+        role_admin = M.ProjectRole.by_name('Admin')._id
+
+        entries = []
+        for proj in projects:
+            admin_role = M.ProjectRole.query.get(project_id=c.project._id,name='Admin')
+            for user_role in admin_role.users_with_role():
+                log.info("User role: %s" % user_role.user)
+                entries.append({'project': proj, 'user': user_role.user})
+
+        return dict(entries=entries,
+                    sort=sort,
+                    limit=limit, page=page, count=count,
+                    page_list=W.page_list)
+
+
 class AdminAppAdminController(DefaultAdminController):
     '''Administer the admin app'''
     pass

--- a/Allura/allura/ext/admin/templates/project_stats.html
+++ b/Allura/allura/ext/admin/templates/project_stats.html
@@ -30,9 +30,13 @@
     <span class="grid-prefix-1 grid-9 installable_tool">
       Private: {{ c.private_count }}
     </span>
-    <span class=" grid-9 installable_tool">
+    <span class="grid-9 installable_tool">
       Last 90 days: {{ c.last_updated_90 }}
     </span>
+    <br style="clear:both"/>
+    <span class="grid-prefix-1 grid-9 installable_tool">
+      <a href="{{ c.project.url() }}admin/stats/adminlist">Admins list</a>
+    </span>
   </div>
 
 {% endblock %}

--- /dev/null
+++ b/Allura/allura/ext/admin/templates/project_stats_adminlist.html
@@ -0,0 +1,39 @@
+{% extends g.theme.master %}
+
+{% do g.register_forge_css('css/forge/deck.css') %}
+
+{% block title %}{{c.project.name}} / Statistics / Admins list{% endblock %}
+
+{% block header %}Admins list{% endblock %}
+
+{% block content %}
+<div class="nested-grid-container">
+  <div style="overflow:auto">
+    <table>
+      <thead>
+        <tr>
+          <th>Project</th>
+          <th>Username</th>
+          <th>E-mail</th>
+          <th>Name</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for entry in entries %}
+        <tr>
+          <td style="white-space: nowrap">{{ entry.project.name }}</td>
+          <td>{{ entry.user.username }}</td>
+          <td>{{ entry.user.preferences.email_address or 'Unknown' }}</td>
+          <td>{{ entry.user.display_name }}</td>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+</div>
+
+<div class="grid-15" style="clear:both">
+  {{page_list.display(limit=limit, page=page, count=count)}}
+</div>
+
+{% endblock %}