diff options
author | Boris Bobrov <breton@cynicmansion.ru> | 2016-02-01 00:35:42 +0100 |
---|---|---|
committer | Boris Bobrov <breton@cynicmansion.ru> | 2016-02-01 00:35:42 +0100 |
commit | db6cc0c0613f324b062e2c396fec6f26c504e362 (patch) | |
tree | e693b73b77175fd25d0c62a9d3ba944da5ba6770 | |
parent | a2608d6b59adc0377ad6eb6b30d596d0c9fa470c (diff) | |
download | mediagoblin-db6cc0c0613f324b062e2c396fec6f26c504e362.tar.lz mediagoblin-db6cc0c0613f324b062e2c396fec6f26c504e362.tar.xz mediagoblin-db6cc0c0613f324b062e2c396fec6f26c504e362.zip |
Change `uploader` to `actor`
Class User doesn't have field `uploader` any more, instead there
`actor`. Fix several uses of `uploader` to `actor`.
-rw-r--r-- | mediagoblin/plugins/processing_info/__init__.py | 6 | ||||
-rw-r--r-- | mediagoblin/user_pages/views.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/plugins/processing_info/__init__.py b/mediagoblin/plugins/processing_info/__init__.py index f89378fe..e5ce0a1c 100644 --- a/mediagoblin/plugins/processing_info/__init__.py +++ b/mediagoblin/plugins/processing_info/__init__.py @@ -36,13 +36,13 @@ def make_stats(context): request = context['request'] user = request.user num_queued = MediaEntry.query.filter_by( - uploader=user.id, state=u'processing').count() + actor=user.id, state=u'processing').count() context['num_queued'] = num_queued num_failed = MediaEntry.query.filter_by( - uploader=user.id, state=u'failed').count() + actor=user.id, state=u'failed').count() context['num_failed'] = num_failed return context - + hooks = { 'setup': setup_plugin, diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index c4f86b29..547048d6 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -656,7 +656,7 @@ def processing_panel(request, page, url_user): request, 'mediagoblin.user_pages.user_home', user=user.username) # Get media entries which are in-processing - entries = (MediaEntry.query.filter_by(uploader=user.id) + entries = (MediaEntry.query.filter_by(actor=user.id) .order_by(MediaEntry.created.desc())) try: |