提交: 3281984437c586ed54a854caec2396d901817886 - allura (git)

allura

Commit MetaInfo

• 修訂: 3281984437c586ed54a854caec2396d901817886 (tree)
• 時間: 2012-07-18 23:28:54
• 作者: Igor Bondarenko <jetmind2@gmai...>
• Commiter: Dave Brondsema

Log Message

[#4349] ticket:110 Add /nf/admin/new_projects page.

Change Summary

• modified: Allura/allura/controllers/site_admin.py
• modified: Allura/allura/model/project.py
• modified: Allura/allura/nf/allura/css/site_style.css
• add: Allura/allura/public/nf/js/site_admin_new_projects.js
• modified: Allura/allura/templates/site_admin.html
• add: Allura/allura/templates/site_admin_new_projects.html
• modified: Allura/allura/tests/functional/test_site_admin.py

差異

--- a/Allura/allura/controllers/site_admin.py
+++ b/Allura/allura/controllers/site_admin.py
@@ -2,14 +2,16 @@ import logging
 from datetime import datetime, timedelta
 from collections import defaultdict
 
-from tg import expose, flash, config, request
+from tg import expose, validate, flash, config, request
 from tg.decorators import with_trailing_slash, without_trailing_slash
 from ming.orm import session
 import pymongo
-from pylons import c
+from pylons import c, g
+from formencode import validators
 
 from allura.lib import helpers as h
 from allura.lib.security import require_access
+from allura.lib.widgets import form_fields as ffw
 from allura import model as M
 from allura.command.show_models import dfs, build_model_inheritance_graph
 
@@ -18,6 +20,9 @@ from urlparse import urlparse
 
 log = logging.getLogger(__name__)
 
+class W:
+    page_list = ffw.PageList()
+    page_size = ffw.PageSize()
 
 class SiteAdminController(object):
 
@@ -164,3 +169,22 @@ class SiteAdminController(object):
                 flash('Artifact not found', 'error')
 
         return data
+
+    @expose('jinja:allura:templates/site_admin_new_projects.html')
+    @validate(dict(page=validators.Int(if_empty=0),
+                   limit=validators.Int(if_empty=100)))
+    def new_projects(self, page=0, limit=100, **kwargs):
+        c.page_list = W.page_list
+        c.page_size = W.page_size
+        limit, pagenum, start = g.handle_paging(limit, page, default=100)
+        count = 0
+        projects = (M.Project.query.find({'name': {'$regex': '^[^u][^/]'}})
+                                   .sort('_id', -1))
+        count = projects.count()
+        projects = projects.skip(start).limit(limit)
+        return {
+            'projects': projects,
+            'limit': limit,
+            'pagenum': pagenum,
+            'count': count
+        }

--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -597,6 +597,13 @@ class Project(MappedClass, ActivityNode, ActivityObject):
             g.credentials.project_roles(project_id=self.root_project._id).named)
         return [ r.user for r in named_roles.roles_that_reach if r.user_id is not None ]
 
+    def admins(self):
+        """Find all the users who have 'Admin' role for this project"""
+        admin_role = ProjectRole.query.get(name='Admin', project_id=self._id)
+        if not admin_role:
+            return []
+        return [r.user.username for r in admin_role.users_with_role(self)]
+
     def user_in_project(self, username):
         from .auth import User
         u = User.by_username(username)

--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2746,7 +2746,13 @@ div.codehilite pre div.code_block {
     padding-left:10px;
     width: 97%;
 }
-
 input.nofloat {
     float: none;
 }
+table thead tr th.tiny.narrow, table tr td.narrow {
+  padding-left: 2px;
+  padding-right: 2px;
+}
+#selected-projects {
+  padding: 10px 10px;
+}

--- /dev/null
+++ b/Allura/allura/public/nf/js/site_admin_new_projects.js
@@ -0,0 +1,15 @@
+$(document).ready(function() {
+  $('.js-select-project').change(function() {
+    var shortname = $(this).attr('data-shortname');
+    if ($(this).is(':checked')) {
+      $('#selected-projects').append(' ' + shortname);
+    } else {
+      var shortnames = $('#selected-projects').text().split(' ');
+      for (var i = 0; i < shortnames.length; i++) {
+        if (shortnames[i] == shortname) break;
+      }
+      shortnames.splice(i, 1);
+      $('#selected-projects').text(shortnames.join(' '));
+    }
+  });
+});

--- a/Allura/allura/templates/site_admin.html
+++ b/Allura/allura/templates/site_admin.html
@@ -1,4 +1,7 @@
 {% set hide_left_bar=False %}
+{% if page == 'new_projects' %}
+  {% set hide_left_bar=True %}
+{% endif %}
 {% extends g.theme.master %}
 
 {% block title %}Forge Site Admin{% endblock %}
@@ -16,6 +19,7 @@
     <li class="{{page=='stats' and 'active' or ''}}"><a href="stats"><b data-icon="{{g.icons['stats'].char}}" class="ico {{g.icons['stats'].css}}"></b>Stats</a></li>
     <li class="{{page=='api_tickets' and 'active' or ''}}"><a href="api_tickets"><b data-icon="{{g.icons['admin'].char}}" class="ico {{g.icons['admin'].css}}"></b>API Tickets</a></li>
     <li class="{{page=='add_subscribers' and 'active' or ''}}"><a href="add_subscribers"><b data-icon="{{g.icons['admin'].char}}" class="ico {{g.icons['admin'].css}}"></b>Add Subscribers</a></li>
+    <li class="{{page=='new_projects' and 'active' or ''}}"><a href="new_projects"><b data-icon="{{g.icons['admin'].char}}" class="ico {{g.icons['admin'].css}}"></b>New Projects</a></li>
   </ul>
 </div>
 {% endblock %}

--- /dev/null
+++ b/Allura/allura/templates/site_admin_new_projects.html
@@ -0,0 +1,44 @@
+{% set page="new_projects" %}
+{% extends 'allura:templates/site_admin.html' %}
+
+{% block content %}
+  {{ c.page_size.display(limit=limit, count=count, page=pagenum) }}
+  <table>
+    <thead>
+      <tr>
+        <th class="narrow"></th>
+        <th class="narrow">Created</th>
+        <th>Shortname</th>
+        <th>Name</th>
+        <th>Short description</th>
+        <th>Summary</th>
+        <th>Deleted?</th>
+        <th>Homepage</th>
+        <th>Admins</th>
+      </tr>
+    </thead>
+    {% for p in projects %}
+    <tr>
+      <td class="narrow">
+        <input type="checkbox" class="js-select-project" data-shortname="{{ p.shortname }}" />
+      </td>
+      <td class="narrow">
+        <small>{{ p._id.generation_time.strftime('%Y-%m-%d %H:%M:%S') }}</small>
+      </td>
+      <td><small>{{ p.shortname }}</small></td>
+      <td><small>{{ p.name }}</small></td>
+      <td><small>{{ p.short_description }}</small></td>
+      <td><small>{{ p.summary }}</small></td>
+      <td><small>{{ 'Yes' if p.deleted else 'No' }}</small></td>
+      <td><small>{{ p.external_homepage|urlize(22) }}</small></td>
+      <td><small>{{ p.admins()|join(' ') }}</small></td>
+    </tr>
+    {% endfor %}
+  </table>
+  {{ c.page_list.display(limit=limit, count=count, page=pagenum) }}
+  <div id="selected-projects"></div>
+{% endblock %}
+
+{% block extra_js %}
+  <script type="text/javascript" src="{{g.forge_static('js/site_admin_new_projects.js')}}"></script>
+{% endblock %}

--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -40,3 +40,10 @@ class TestSiteAdmin(TestController):
     def test_tickets_access(self):
         r = self.app.get('/nf/admin/api_tickets', extra_environ=dict(
                 username='test-user'), status=403)
+
+    def test_new_projects_access(self):
+        self.app.get('/nf/admin/new_projects', extra_environ=dict(
+            username='test_user'), status=403)
+        r = self.app.get('/nf/admin/new_projects', extra_environ=dict(
+            username='*anonymous'), status=302).follow()
+        assert 'Login' in r