Commit: 6f8e88b094634f1992a9412c5f56a720425d7104 - allura (git)

allura

Commit MetaInfo

• Revisión: 6f8e88b094634f1992a9412c5f56a720425d7104 (tree)
• Tiempo: 2012-04-19 03:33:45
• Autor: Tim Van Steenburgh <tvansteenburgh@geek...>
• Commiter: Tim Van Steenburgh

Log Message

Merge branch 'dev' of git://sfi-engr-scm-1/forge into dev

Cambiar Resumen

• modified: Allura/allura/controllers/project.py
• modified: Allura/allura/ext/admin/admin_main.py
• modified: Allura/allura/lib/helpers.py
• add: Allura/allura/templates/neighborhood_stats.html
• add: Allura/allura/templates/neighborhood_stats_adminlist.html
• modified: Allura/allura/tests/functional/test_neighborhood.py

Diferencia incremental

--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -1,10 +1,10 @@
 import re
 import logging
-
-from bson import ObjectId
+from datetime import datetime, timedelta
 from urllib import unquote
 from itertools import chain, islice
 
+from bson import ObjectId
 from tg import expose, flash, redirect, validate, request, response
 from tg.decorators import with_trailing_slash, without_trailing_slash
 from pylons import c, g
@@ -400,17 +400,19 @@ class NeighborhoodAdminController(object):
     def __init__(self, neighborhood):
         self.neighborhood = neighborhood
         self.awards = NeighborhoodAwardsController(self.neighborhood)
+        self.stats = NeighborhoodStatsController(self.neighborhood)
+
+    def _check_security(self):
+        require_access(self.neighborhood, 'admin')
 
     @with_trailing_slash
     @expose()
     def index(self, **kw):
-        require_access(self.neighborhood, 'admin')
         utils.permanent_redirect('overview')
 
     @without_trailing_slash
     @expose('jinja:allura:templates/neighborhood_admin_overview.html')
     def overview(self, **kw):
-        require_access(self.neighborhood, 'admin')
         set_nav(self.neighborhood)
         c.overview_form = W.neighborhood_overview_form
         return dict(neighborhood=self.neighborhood)
@@ -418,13 +420,11 @@ class NeighborhoodAdminController(object):
     @without_trailing_slash
     @expose('jinja:allura:templates/neighborhood_admin_permissions.html')
     def permissions(self):
-        require_access(self.neighborhood, 'admin')
         set_nav(self.neighborhood)
         return dict(neighborhood=self.neighborhood)
 
     @expose('json:')
     def project_search(self, term=''):
-        require_access(self.neighborhood, 'admin')
         if len(term) < 3:
             raise exc.HTTPBadRequest('"term" param must be at least length 3')
         project_regex = re.compile('(?i)%s' % re.escape(term))
@@ -442,7 +442,6 @@ class NeighborhoodAdminController(object):
     @without_trailing_slash
     @expose('jinja:allura:templates/neighborhood_admin_accolades.html')
     def accolades(self):
-        require_access(self.neighborhood, 'admin')
         set_nav(self.neighborhood)
         awards = M.Award.query.find(dict(created_by_neighborhood_id=self.neighborhood._id)).all()
         awards_count = len(awards)
@@ -460,7 +459,6 @@ class NeighborhoodAdminController(object):
     @require_post()
     @validate(W.neighborhood_overview_form, error_handler=overview)
     def update(self, name=None, css=None, homepage=None, project_template=None, icon=None, **kw):
-        require_access(self.neighborhood, 'admin')
         self.neighborhood.name = name
         self.neighborhood.redirect = kw.pop('redirect', '')
         self.neighborhood.homepage = homepage
@@ -485,6 +483,77 @@ class NeighborhoodAdminController(object):
             neighborhood=self.neighborhood,
         )
 
+class NeighborhoodStatsController(object):
+
+    def __init__(self, neighborhood):
+        self.neighborhood = neighborhood
+
+    @with_trailing_slash
+    @expose('jinja:allura:templates/neighborhood_stats.html')
+    def index(self, **kw):
+        delete_count = M.Project.query.find(dict(neighborhood_id=self.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()
+        if M.Project.query.find(dict(neighborhood_id=self.neighborhood._id, deleted=False)).count() < 20000: # arbitrary limit for efficiency
+            for p in M.Project.query.find(dict(neighborhood_id=self.neighborhood._id, deleted=False)):
+                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
+    
+        set_nav(self.neighborhood)
+        return dict(
+            delete_count = delete_count,
+            public_count = public_count,
+            private_count = private_count,
+            last_updated_30 = last_updated_30,
+            last_updated_60 = last_updated_60,
+            last_updated_90 = last_updated_90,
+            neighborhood = self.neighborhood,
+        )
+
+    @without_trailing_slash
+    @expose('jinja:allura:templates/neighborhood_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=self.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()
+
+        entries = []
+        for proj in projects:
+            admin_role = M.ProjectRole.query.get(project_id=proj.root_project._id,name='Admin')
+            if admin_role is None:
+                continue
+            user_role_list = M.ProjectRole.query.find(dict(project_id=proj.root_project._id, name=None)).all()
+            for ur in user_role_list:
+                if ur.user is not None and admin_role._id in ur.roles:
+                    entries.append({'project': proj, 'user': ur.user})
+
+        set_nav(self.neighborhood)
+        return dict(entries=entries,
+                    sort=sort,
+                    limit=limit, page=page, count=count,
+                    page_list=W.page_list,
+                    neighborhood=self.neighborhood,
+                    )
+
+
 class NeighborhoodModerateController(object):
 
     def __init__(self, neighborhood):

--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -1,7 +1,9 @@
 import logging
 from collections import defaultdict
-from datetime import datetime
+from datetime import datetime, timedelta
 
+import Image
+import pymongo
 import pkg_resources
 from pylons import c, g, request
 from paste.deploy.converters import asbool
@@ -40,6 +42,7 @@ class W:
     screenshot_list = ProjectScreenshots()
     metadata_admin = aw.MetadataAdmin()
     audit = aw.AuditLog()
+    page_list=ffw.PageList()
 
 class AdminWidgets(WidgetController):
     widgets=['users', 'tool_status']
@@ -138,6 +141,7 @@ class AdminApp(Application):
             links.append(SitemapEntry('Invitation(s)', admin_url+'invitations'))
         links.append(SitemapEntry('Audit Trail', admin_url+ 'audit/'))
         if c.project.shortname == '--init--':
+            links.append(SitemapEntry('Statistics', nbhd_admin_url+ 'stats/'))
             links.append(None)
             links.append(SitemapEntry('Help', nbhd_admin_url+ 'help/'))
         return links
@@ -728,6 +732,7 @@ class AuditController(BaseController):
             page=page,
             count=count)
 
+
 class AdminAppAdminController(DefaultAdminController):
     '''Administer the admin app'''
     pass

--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -26,6 +26,7 @@ from tg.decorators import before_validate
 from formencode.variabledecode import variable_decode
 import formencode
 from jinja2 import Markup
+from paste.deploy.converters import asbool
 
 from webhelpers import date, feedgenerator, html, number, misc, text
 

--- /dev/null
+++ b/Allura/allura/templates/neighborhood_stats.html
@@ -0,0 +1,33 @@
+{% extends g.theme.master %}
+
+{% block top_nav %}
+    {% include 'allura:templates/jinja_master/neigh_top_nav.html' %}
+{% endblock %}
+
+{% block title %}Neighborhood Statistics{% endblock %}
+
+{% block header %}Neighborhood Statistics{% endblock %}
+
+{% block content %}
+  <div class="grid-9">
+    <b>Number of projects that are...</b>
+    <ul>
+      <li>Public: {{ public_count }}</li>
+      <li>Private: {{ private_count }}</li>
+      {% if h.asbool(config.get('allow_project_delete', True)) %}
+      <li>Deleted: {{ delete_count }}</li>
+      {% endif %}
+    </ul>
+  </div>
+  <div class="grid-10">
+    <b>Number of projects updated in the last...</b>
+    <ul>
+    <li>30 days: {{ last_updated_30 }}</li>
+    <li>60 days: {{ last_updated_60 }}</li>
+    <li>90 days: {{ last_updated_90 }}</li>
+    </ul>
+  </div>
+  <div class="grid-19">
+    <a href="adminlist">View a list of project admins</a>
+  </div>
+{% endblock %}

--- /dev/null
+++ b/Allura/allura/templates/neighborhood_stats_adminlist.html
@@ -0,0 +1,37 @@
+{% extends g.theme.master %}
+
+{% block title %}{{c.project.name}} / Statistics / Admins list{% endblock %}
+
+{% block header %}Admins list{% endblock %}
+
+{% block top_nav %}
+    {% include 'allura:templates/jinja_master/neigh_top_nav.html' %}
+{% endblock %}
+
+{% block content %}
+<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"><a href="{{entry.project.url()}}">{{ entry.project.name }}</a></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 class="grid-15" style="clear:both">
+  {{page_list.display(limit=limit, page=page, count=count)}}
+</div>
+
+{% endblock %}

--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -2,10 +2,12 @@ import json
 import os
 from cStringIO import StringIO
 from nose.tools import assert_raises
+from datetime import datetime, timedelta
 
 import Image
 from tg import config
 from nose.tools import assert_equal
+from ming.orm.ormsession import ThreadLocalORMSession
 
 import allura
 from allura import model as M
@@ -44,6 +46,44 @@ class TestNeighborhood(TestController):
                           params=dict(project_template='{'),
                           extra_environ=dict(username='root'))
         assert 'Invalid JSON' in r
+    
+    def test_admin_stats_del_count(self):
+        neighborhood = M.Neighborhood.query.get(name='Adobe')
+        proj = M.Project.query.get(neighborhood_id=neighborhood._id)
+        proj.deleted = True
+        ThreadLocalORMSession.flush_all()
+        r = self.app.get('/adobe/_admin/stats/', extra_environ=dict(username='root'))
+        assert 'Deleted: 1' in r
+        assert 'Private: 0' in r
+
+    def test_admin_stats_priv_count(self):
+        neighborhood = M.Neighborhood.query.get(name='Adobe')
+        proj = M.Project.query.get(neighborhood_id=neighborhood._id)
+        proj.deleted = False
+        proj.private = True
+        ThreadLocalORMSession.flush_all()
+        r = self.app.get('/adobe/_admin/stats/', extra_environ=dict(username='root'))
+        assert 'Deleted: 0' in r
+        assert 'Private: 1' in r
+
+    def test_admin_stats_adminlist(self):
+        neighborhood = M.Neighborhood.query.get(name='Adobe')
+        proj = M.Project.query.get(neighborhood_id=neighborhood._id)
+        proj.private = False
+        ThreadLocalORMSession.flush_all()
+        r = self.app.get('/adobe/_admin/stats/adminlist', extra_environ=dict(username='root'))
+        pq = M.Project.query.find(dict(neighborhood_id=neighborhood._id, deleted=False))
+        pq.sort('name')
+        projects = pq.skip(0).limit(int(25)).all()
+        for proj in projects:
+            admin_role = M.ProjectRole.query.get(project_id=proj.root_project._id,name='Admin')
+            if admin_role is None:
+                continue
+            user_role_list = M.ProjectRole.query.find(dict(project_id=proj.root_project._id, name=None)).all()
+            for ur in user_role_list:
+                if ur.user is not None and admin_role._id in ur.roles:
+                    assert proj.name in r
+                    assert ur.user.username in r
 
     def test_icon(self):
         file_name = 'neo-icon-set-454545-256x350.png'
@@ -532,4 +572,4 @@ class TestNeighborhood(TestController):
 
     def test_help(self):
         r = self.app.get('/p/_admin/help/', extra_environ=dict(username='root'))
-        assert 'macro' in r
\ No newline at end of file
+        assert 'macro' in r