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

1 files changed, 2 insertions, 2 deletions

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 {