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

5 files changed, 14 insertions, 14 deletions

diff --git a/mediagoblin/plugins/api/tools.py b/mediagoblin/plugins/api/tools.py
index 56256236..e406888e 100644
--- a/mediagoblin/plugins/api/tools.py
+++ b/mediagoblin/plugins/api/tools.py
@@ -62,12 +62,12 @@ def get_entry_serializable(entry, urlgen):
     to views.
     '''
     return {
-            'user': entry.get_uploader.username,
-            'user_id': entry.get_uploader.id,
-            'user_bio': entry.get_uploader.bio,
-            'user_bio_html': entry.get_uploader.bio_html,
+            'user': entry.get_actor.username,
+            'user_id': entry.get_actor.id,
+            'user_bio': entry.get_actor.bio,
+            'user_bio_html': entry.get_actor.bio_html,
             'user_permalink': urlgen('mediagoblin.user_pages.user_home',
-                user=entry.get_uploader.username,
+                user=entry.get_actor.username,
                 qualified=True),
             'id': entry.id,
             'created': entry.created.isoformat(),
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)
 
 
diff --git a/mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html b/mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html
index 3a9d872c..15ea1536 100644
--- a/mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html
+++ b/mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html
@@ -35,7 +35,7 @@
 {% endif %}
 {% if request.user and request.user.has_privilege('admin') %}
   <a href="{{ request.urlgen('mediagoblin.edit.metadata',
-                    user=media.get_uploader.username,
+                    user=media.get_actor.username,
                     media_id=media.id) }}">
   {% trans %}Edit Metadata{% endtrans %}</a>
 {% endif %}
diff --git a/mediagoblin/plugins/piwigo/views.py b/mediagoblin/plugins/piwigo/views.py
index 1fe1e576..ab741a72 100644
--- a/mediagoblin/plugins/piwigo/views.py
+++ b/mediagoblin/plugins/piwigo/views.py
@@ -82,7 +82,7 @@ def pwg_categories_getList(request):
 
     if request.user:
         collections = Collection.query.filter_by(
-            get_creator=request.user).order_by(Collection.title)
+            get_actor=request.user).order_by(Collection.title)
 
         for c in collections:
             catlist.append({'id': c.id,
@@ -142,7 +142,7 @@ def pwg_images_addSimple(request):
         collection_id = form.category.data
         if collection_id > 0:
             collection = Collection.query.get(collection_id)
-            if collection is not None and collection.creator == request.user.id:
+            if collection is not None and collection.actor == request.user.id:
                 add_media_to_collection(collection, entry, "")
 
         return {