コミット: 55898e56bde064bfd8a010ff11d3fb3c34eaf84b - allura (git)

allura

コミットメタ情報

• リビジョン: 55898e56bde064bfd8a010ff11d3fb3c34eaf84b (tree)
• 日時: 2012-03-22 06:07:36
• 作者: Yaroslav Luzin <jardev@gmai...>
• コミッター: Yaroslav Luzin

ログメッセージ

Merge branch 't31_testnbprivate'

変更サマリ

• modified: Allura/allura/command/set_neighborhood_private.py
• modified: Allura/allura/controllers/project.py
• modified: Allura/allura/lib/plugin.py
• modified: Allura/allura/tests/functional/test_neighborhood.py
• modified: Allura/allura/tests/test_commands.py

差分

--- a/Allura/allura/command/set_neighborhood_private.py
+++ b/Allura/allura/command/set_neighborhood_private.py
@@ -2,11 +2,11 @@ from . import base
 
 from bson import ObjectId
 from allura import model as M
-from allura.lib import plugin
+from allura.lib import plugin, exceptions
 from ming.orm import session
 
 # Example usage:
-# paster set-neighborhood-private development.ini 4f50c898610b270c92000286 1
+# paster set-neighborhood-private development.ini <neighborhood_id> 1
 class SetNeighborhoodPrivateCommand(base.Command):
     min_args=3
     max_args=3
@@ -22,6 +22,14 @@ class SetNeighborhoodPrivateCommand(base.Command):
             private_val = True
         else:
             private_val = False
-        n = M.Neighborhood.query.get(_id = ObjectId(n_id))
-        n.allow_private = private_val
-        session(M.Neighborhood).flush()
+
+        n = M.Neighborhood.query.get(name=n_id)
+        if not n:
+            n = M.Neighborhood.query.get(_id=ObjectId(n_id))
+
+        if not n:
+            raise exceptions.NoSuchNeighborhoodError("The neighborhood %s "\
+                "could not be found in the database" % n_id)
+        else:
+            n.allow_private = private_val
+            session(M.Neighborhood).flush()

--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -152,8 +152,6 @@ class NeighborhoodController(object):
     def register(self, project_unixname=None, project_description=None, project_name=None, neighborhood=None,
                  private_project=None, tools=None, **kw):
         require_access(self.neighborhood, 'register')
-        if self.neighborhood.allow_private == False:
-            private_project = False
         if private_project:
             require_access(self.neighborhood, 'admin')
         neighborhood = M.Neighborhood.query.get(name=neighborhood)

--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -337,6 +337,10 @@ class ProjectRegistrationProvider(object):
         '''
         from allura import model as M
 
+        # Check for private project rights
+        if neighborhood.allow_private == False and private_project:
+            raise ValueError("You can't create private projects for %s neighborhood" % neighborhood.name)
+
         # Check for project limit creation
         pq = M.Project.query.find(dict(
                 neighborhood_id=neighborhood._id,

--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -1,6 +1,7 @@
 import json
 import os
 from cStringIO import StringIO
+from nose.tools import assert_raises
 
 import Image
 from tg import config
@@ -117,9 +118,9 @@ class TestNeighborhood(TestController):
         assert 'Title bar, foreground' in r
 
         r = self.app.post('/adobe/_admin/update',
-                          params={'name': 'Adobe', 
-                                  'css': '', 
-                                  'homepage': '', 
+                          params={'name': 'Adobe',
+                                  'css': '',
+                                  'homepage': '',
                                   'css-projecttitlefont': 'arial,sans-serif',
                                   'css-projecttitlecolor': 'green',
                                   'css-barontop': '#555555',
@@ -273,7 +274,8 @@ class TestNeighborhood(TestController):
         r = self.app.get('/p/add_project', extra_environ=dict(username='root'))
         assert 'private_project' not in r
 
-        self.app.post(
+        assert_raises(ValueError,
+            self.app.post,
             '/p/register',
             params=dict(
                 project_unixname='myprivate1',
@@ -285,7 +287,7 @@ class TestNeighborhood(TestController):
             extra_environ=dict(username='root'))
 
         proj = M.Project.query.get(shortname='myprivate1', neighborhood_id=neighborhood._id)
-        assert not proj.private
+        assert proj is None
 
         # Turn on private
         neighborhood = M.Neighborhood.query.get(name='Projects')

--- a/Allura/allura/tests/test_commands.py
+++ b/Allura/allura/tests/test_commands.py
@@ -4,7 +4,7 @@ from datadiff.tools import assert_equal
 import pylons
 
 from alluratest.controller import setup_basic_test, setup_global_objects
-from allura.command import script, set_neighborhood_level
+from allura.command import script, set_neighborhood_level, set_neighborhood_private
 from allura import model as M
 
 
@@ -34,3 +34,19 @@ def test_set_neighborhood_level():
 
     neighborhood = M.Neighborhood.query.get(_id=n_id)
     assert neighborhood.level == 'gold'
+
+def test_set_neighborhood_private():
+    neighborhood = M.Neighborhood.query.find().first()
+    n_id = neighborhood._id
+
+    cmd = set_neighborhood_private.SetNeighborhoodPrivateCommand('setnbprivate')
+    cmd.run([test_config, str(n_id), '1'])
+    cmd.command()
+    neighborhood = M.Neighborhood.query.get(_id=n_id)
+    assert neighborhood.allow_private
+
+    cmd = set_neighborhood_private.SetNeighborhoodPrivateCommand('setnbprivate')
+    cmd.run([test_config, str(n_id), '0'])
+    cmd.command()
+    neighborhood = M.Neighborhood.query.get(_id=n_id)
+    assert not neighborhood.allow_private