From 0f3bf8d4b180ffd1907d1578e087522aad7d9158 Mon Sep 17 00:00:00 2001
From: Jessica Tallon <tsyesika@tsyesika.se>
Date: Thu, 17 Sep 2015 13:47:56 +0200
Subject: Collection changes and migration for federation

- Adds a "type" column to the Collection object and allows the
CollectionItem model to contain any object.
- Changes "items" to "num_items" as per TODO
- Renames "uploader", "creator" and "user" to a common "actor" in most places
---
 .../archivalook/templates/archivalook/feature_media_sidebar.html  | 8 ++++----
 mediagoblin/plugins/archivalook/tools.py                          | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'mediagoblin/plugins/archivalook')

diff --git a/mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html b/mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html
index c5b8a7d6..942a888b 100644
--- a/mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html
+++ b/mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html
@@ -21,7 +21,7 @@
               {% if not media_feature %}
                 <a href="{{ request.urlgen(
                     'mediagoblin.user_pages.media_feature',
-                            user=media.get_uploader.username,
+                            user=media.get_actor.username,
                              media=media.slug_or_id) }}"
         class="button_action" id="button_featuremedia" title="{% trans %}
 Feature Media {% endtrans %}">
@@ -29,7 +29,7 @@ Feature Media {% endtrans %}">
               {% else %}
                 <a href="{{ request.urlgen(
                     'mediagoblin.user_pages.media_unfeature',
-                            user=media.get_uploader.username,
+                            user=media.get_actor.username,
                              media=media.slug_or_id) }}"
         class="button_action" id="button_unfeaturemedia" title="{% trans %}
 Unfeature Media {% endtrans %}">
@@ -37,7 +37,7 @@ Unfeature Media {% endtrans %}">
                 {% if not media_feature.display_type == 'primary' %}
                 <a href="{{ request.urlgen(
                     'mediagoblin.user_pages.feature_promote',
-                            user=media.get_uploader.username,
+                            user=media.get_actor.username,
                              media=media.slug_or_id) }}"
         class="button_action" id="button_promotefeature" title="{% trans %}
 Promote Feature {% endtrans %}">
@@ -45,7 +45,7 @@ Promote Feature {% endtrans %}">
                 {% endif %}{% if not media_feature.display_type == 'tertiary' %}
                 <a href="{{ request.urlgen(
                     'mediagoblin.user_pages.feature_demote',
-                            user=media.get_uploader.username,
+                            user=media.get_actor.username,
                              media=media.slug_or_id) }}"
         class="button_action" id="button_demotefeature" title="{% trans %}
 Demote Feature {% endtrans %}">
diff --git a/mediagoblin/plugins/archivalook/tools.py b/mediagoblin/plugins/archivalook/tools.py
index fb5673e1..ad2eee5f 100644
--- a/mediagoblin/plugins/archivalook/tools.py
+++ b/mediagoblin/plugins/archivalook/tools.py
@@ -38,7 +38,7 @@ def get_media_entry_from_uploader_slug(uploader_username, slug):
         LocalUser.username==uploader_username
     ).first()
     media = MediaEntry.query.filter(
-        MediaEntry.get_uploader == uploader ).filter(
+        MediaEntry.get_actor == uploader ).filter(
         MediaEntry.slug == slug).first()
     return media
 
@@ -141,7 +141,7 @@ def create_featured_media_textbox():
         for feature in feature_list:
             media_entry = feature.media_entry
             output_text += u'/u/{uploader_username}/m/{media_slug}/\n'.format(
-                uploader_username = media_entry.get_uploader.username,
+                uploader_username = media_entry.get_actor.username,
                 media_slug = media_entry.slug)
 
 
-- 
cgit v1.2.3