You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2014/03/12 21:41:30 UTC
[1/4] git commit: [#7267] [#7015] Use fullpath for trove events
Repository: incubator-allura
Updated Branches:
refs/heads/master 03c8e4d20 -> cc742e3d8
[#7267] [#7015] Use fullpath for trove events
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/12637d41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/12637d41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/12637d41
Branch: refs/heads/master
Commit: 12637d41e5db4b07d4e5b243c7403af80b3bc8ec
Parents: 03c8e4d
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Tue Mar 4 16:38:28 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Mar 12 20:00:57 2014 +0000
----------------------------------------------------------------------
Allura/allura/model/project.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/12637d41/Allura/allura/model/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py
index e5902b8..4d1ea94 100644
--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -92,13 +92,13 @@ class ProjectCategory(MappedClass):
class TroveCategoryMapperExtension(MapperExtension):
def after_insert(self, obj, state, sess):
- g.post_event('trove_category_created', obj._id)
+ g.post_event('trove_category_created', obj.fullpath)
def after_update(self, obj, state, sess):
- g.post_event('trove_category_updated', obj._id)
+ g.post_event('trove_category_updated', obj.fullpath)
def after_delete(self, obj, state, sess):
- g.post_event('trove_category_deleted', obj._id)
+ g.post_event('trove_category_deleted', obj.fullpath)
class TroveCategory(MappedClass):
[3/4] git commit: [#7267] [#7015] Bump to Ming 0.4.4 for delete event
fixes
Posted by br...@apache.org.
[#7267] [#7015] Bump to Ming 0.4.4 for delete event fixes
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/0e760e8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/0e760e8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/0e760e8a
Branch: refs/heads/master
Commit: 0e760e8a27657f0817d93ac46bb2857193de45b2
Parents: b5fcdbc
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Mon Mar 10 19:44:48 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Mar 12 20:03:43 2014 +0000
----------------------------------------------------------------------
requirements-common.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0e760e8a/requirements-common.txt
----------------------------------------------------------------------
diff --git a/requirements-common.txt b/requirements-common.txt
index 82be773..ee892dc 100644
--- a/requirements-common.txt
+++ b/requirements-common.txt
@@ -21,7 +21,7 @@ httplib2==0.7.4
iso8601==0.1.4
Jinja2==2.6
Markdown==2.2.0
-Ming==0.4.2
+Ming==0.4.4
oauth2==1.5.170
# tg2 dep PasteDeploy must specified before TurboGears2, to avoid a version/allow-hosts problem
Paste==1.7.5.1
[2/4] git commit: [#7267] [#7015] Lookup troves by id since path
could change
Posted by br...@apache.org.
[#7267] [#7015] Lookup troves by id since path could change
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/b5fcdbc5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/b5fcdbc5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/b5fcdbc5
Branch: refs/heads/master
Commit: b5fcdbc5f61276343c637cafd8a0ea9ab870acc1
Parents: 12637d4
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Fri Mar 7 16:43:34 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Mar 12 20:03:35 2014 +0000
----------------------------------------------------------------------
Allura/allura/model/project.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b5fcdbc5/Allura/allura/model/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py
index 4d1ea94..c5ffd91 100644
--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -92,13 +92,13 @@ class ProjectCategory(MappedClass):
class TroveCategoryMapperExtension(MapperExtension):
def after_insert(self, obj, state, sess):
- g.post_event('trove_category_created', obj.fullpath)
+ g.post_event('trove_category_created', obj.trove_cat_id)
def after_update(self, obj, state, sess):
- g.post_event('trove_category_updated', obj.fullpath)
+ g.post_event('trove_category_updated', obj.trove_cat_id)
def after_delete(self, obj, state, sess):
- g.post_event('trove_category_deleted', obj.fullpath)
+ g.post_event('trove_category_deleted', obj.trove_cat_id)
class TroveCategory(MappedClass):
[4/4] git commit: [#7267] [#7015] Update test to reflect
s/_id/trove_cat_id/
Posted by br...@apache.org.
[#7267] [#7015] Update test to reflect s/_id/trove_cat_id/
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/cc742e3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/cc742e3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/cc742e3d
Branch: refs/heads/master
Commit: cc742e3d8ab4a5ccbf5f7be9457ae888bed48137
Parents: 0e760e8
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Wed Mar 12 18:48:03 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Mar 12 20:03:49 2014 +0000
----------------------------------------------------------------------
Allura/allura/tests/functional/test_trovecategory.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cc742e3d/Allura/allura/tests/functional/test_trovecategory.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_trovecategory.py b/Allura/allura/tests/functional/test_trovecategory.py
index b30b63a..a3b2f18 100644
--- a/Allura/allura/tests/functional/test_trovecategory.py
+++ b/Allura/allura/tests/functional/test_trovecategory.py
@@ -37,15 +37,15 @@ class TestTroveCategory(TestController):
r = self.app.post('/categories/create/', params=dict(categoryname='test'))
category_id = post_event.call_args[0][1]
- assert_true(isinstance(category_id, ObjectId))
+ assert_true(isinstance(category_id, int))
assert_equals(post_event.call_args[0][0], 'trove_category_created')
- category = M.TroveCategory.query.get(_id=category_id)
+ category = M.TroveCategory.query.get(trove_cat_id=category_id)
# Update event
category.fullname = 'test2'
session(M.TroveCategory).flush()
edited_category_id = post_event.call_args[0][1]
- assert_true(isinstance(edited_category_id, ObjectId))
+ assert_true(isinstance(edited_category_id, int))
assert_equals(edited_category_id, category_id)
assert_equals(post_event.call_args[0][0], 'trove_category_updated')
@@ -53,7 +53,7 @@ class TestTroveCategory(TestController):
M.TroveCategory.delete(category)
session(M.TroveCategory).flush()
deleted_category_id = post_event.call_args[0][1]
- assert_true(isinstance(deleted_category_id, ObjectId))
+ assert_true(isinstance(deleted_category_id, int))
assert_equals(deleted_category_id, category_id)
assert_equals(post_event.call_args[0][0], 'trove_category_deleted')