You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2012/10/02 18:36:13 UTC
[1/6] git commit: [#4785] Fixes for changes from [#4637]
Updated Branches:
refs/heads/cj/4785 [created] 4ba7d0886
[#4785] Fixes for changes from [#4637]
Signed-off-by: Cory Johns <jo...@geek.net>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4ba7d088
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4ba7d088
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4ba7d088
Branch: refs/heads/cj/4785
Commit: 4ba7d0886a90f9a975ee29abd8a6aeea759a4b7d
Parents: 473db38
Author: Cory Johns <jo...@geek.net>
Authored: Tue Oct 2 16:35:53 2012 +0000
Committer: Cory Johns <jo...@geek.net>
Committed: Tue Oct 2 16:35:53 2012 +0000
----------------------------------------------------------------------
.../forgeshorturl/command/migrate_urls.py | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4ba7d088/ForgeShortUrl/forgeshorturl/command/migrate_urls.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/command/migrate_urls.py b/ForgeShortUrl/forgeshorturl/command/migrate_urls.py
index 3019308..154e0de 100644
--- a/ForgeShortUrl/forgeshorturl/command/migrate_urls.py
+++ b/ForgeShortUrl/forgeshorturl/command/migrate_urls.py
@@ -1,4 +1,5 @@
import tg
+from pylons import tmpl_context as c
from bson import ObjectId
from forgeshorturl.command.base import ShortUrlCommand
from forgeshorturl.model import ShortUrl
@@ -31,10 +32,13 @@ class MigrateUrls(ShortUrlCommand):
def command(self):
self.basic_setup()
p_id = self.args[2]
- p = M.Project.query.get(_id=ObjectId(p_id))
- if not p:
+ mount_point = 'url'
+ c.project = M.Project.query.get(_id=ObjectId(p_id))
+ if not c.project:
raise exceptions.NoSuchProjectError('The project %s '
'could not be found in the database' % p_id)
+ c.app = c.project.app_instance(mount_point)
+ assert c.app, 'Project does not have ShortURL app installed'
db = sqlalchemy.create_engine(self._connection_string())
meta = sqlalchemy.MetaData()
@@ -48,7 +52,6 @@ class MigrateUrls(ShortUrlCommand):
url.private = row['private'] == 'Y'
url.created = datetime.utcfromtimestamp(row['create_time'])
url.last_updated = datetime.utcfromtimestamp(row['edit_time'])
- url.project_id = p._id
user = M.User.query.get(sfx_userid=row['create_user'])
user_id = user._id if user else M.User.anonymous()._id
url.create_user = user_id