Commit: f3e3ff65de5fc6b1c56035b4ce4abedb5d981267 - allura (git)

allura

Commit MetaInfo

• Révision: f3e3ff65de5fc6b1c56035b4ce4abedb5d981267 (tree)
• l'heure: 2011-06-22 23:44:48
• Auteur: Rick Copeland <rcopeland@geek...>
• Commiter: Rick Copeland

Message de Log

[#2078] Some fixes to deal with Zarkov crazy classes being included in the data model

Signed-off-by: Rick Copeland <[e-mail]>

Change Summary

• modified: Allura/allura/command/show_models.py
• add: Allura/allura/templates/site_admin.html
• modified: Allura/allura/tests/functional/test_site_admin.py
• modified: scripts/restore_project.py

Modification

--- a/Allura/allura/command/show_models.py
+++ b/Allura/allura/command/show_models.py
@@ -3,7 +3,7 @@ from collections import defaultdict
 
 from pylons import c, g
 
-from ming.orm import mapper, Mapper
+from ming.orm import mapper, session, Mapper
 from ming.orm.declarative import MappedClass
 
 import allura.tasks.index_tasks
@@ -121,7 +121,7 @@ class EnsureIndexCommand(base.Command):
                 base.log.info('... skipping abstract class %s', cls)
                 continue
             base.log.info('... for class %s', cls)
-            if cls.__mongometa__.session in (
+            if session(cls) in (
                 M.main_orm_session, M.repository_orm_session):
                 idx = main_indexes[cname]
             else:

--- /dev/null
+++ b/Allura/allura/templates/site_admin.html
@@ -0,0 +1,29 @@
+{% set hide_left_bar=False %}
+{% extends g.theme.master %}
+
+{% block title %}Forge Site Admin{% endblock %}
+{% block header %}Forge Site Admin{% endblock %}
+
+{% block nav_menu %}
+<div class="column grid_1">
+  <img src="{{g.forge_static('images/project_default.png')}}" class="project_icon" alt=""/>
+</div>
+<div class="column grid_9">
+  <h1 class="project_title">Site Admin</h1>
+</div>
+<div class="column grid_2">&nbsp;</div>
+{% endblock %}
+
+{% block sidebar_menu %}
+<div id="sidebar">
+  <div>&nbsp;</div>
+  <ul>
+    <li class="{{page=='index' and 'active' or ''}}"><a href="."><b data-icon="{{g.icons['admin'].char}}" class="ico {{g.icons['admin'].css}}"></b>Home</a></li>
+    <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=='cpa_stats' and 'active' or ''}}"><a href="cpa_stats"><b data-icon="{{g.icons['stats'].char}}" class="ico {{g.icons['stats'].css}}"></b>CPA 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>
+  </ul>
+</div>
+{% endblock %}
+
+{% block inner_grid %}{% endblock %}

--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -37,20 +37,6 @@ class TestSiteAdmin(TestController):
         assert headers[4].contents[0] == 'Template'
         assert headers[5].contents[0] == 'Total Time'
 
-    def test_cpa(self):
-        r = self.app.get('/nf/admin/cpa_stats', extra_environ=dict(
-                username='test-user'), status=403)
-        r = self.app.get('/nf/admin/cpa_stats', extra_environ=dict(
-                username='root'))
-        assert 'Forge Site Admin' in r.html.find('h2',{'class':'dark title'}).contents[0]
-        stats_table = r.html.find('table')
-        headers = stats_table.findAll('th')
-        assert headers[0].contents[0] == 'Tool Name'
-        assert headers[1].contents[0] == 'Class Name'
-        assert headers[2].contents[0] == 'Create'
-        assert headers[3].contents[0] == 'Modify'
-        assert headers[4].contents[0] == 'Delete'
-
     def test_tickets_access(self):
         r = self.app.get('/nf/admin/api_tickets', extra_environ=dict(
                 username='test-user'), status=403)

--- a/scripts/restore_project.py
+++ b/scripts/restore_project.py
@@ -64,7 +64,7 @@ def get_repo_collections():
     res = {}
     for m in Mapper.all_mappers():
         cls = m.mapped_class
-        cname = cls.__mongometa__.name
+        cname = m.collection.m.collection_name
         if issubclass(cls, M.Repository): res[cname] = cls
     return res