diff --git a/journal/migrations/0006_auto_20230114_2139.py b/journal/migrations/0006_auto_20230114_2139.py new file mode 100644 index 00000000..48a2738e --- /dev/null +++ b/journal/migrations/0006_auto_20230114_2139.py @@ -0,0 +1,43 @@ +# Generated by Django 3.2.16 on 2023-01-14 13:39 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ("journal", "0005_auto_20230114_1134"), + ] + + operations = [ + migrations.RenameField( + model_name="featuredcollection", + old_name="collection", + new_name="target", + ), + migrations.RemoveField( + model_name="featuredcollection", + name="id", + ), + migrations.AddField( + model_name="featuredcollection", + name="piece_ptr", + field=models.OneToOneField( + auto_created=True, + default=0, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="journal.piece", + ), + preserve_default=False, + ), + migrations.AlterUniqueTogether( + name="featuredcollection", + unique_together={("owner", "target")}, + ), + ] diff --git a/social/migrations/0003_alter_localactivity_template.py b/social/migrations/0003_alter_localactivity_template.py new file mode 100644 index 00000000..ab061206 --- /dev/null +++ b/social/migrations/0003_alter_localactivity_template.py @@ -0,0 +1,27 @@ +# Generated by Django 3.2.16 on 2023-01-14 13:02 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("social", "0002_initial"), + ] + + operations = [ + migrations.AlterField( + model_name="localactivity", + name="template", + field=models.CharField( + choices=[ + ("mark_item", "Markitem"), + ("review_item", "Reviewitem"), + ("create_collection", "Createcollection"), + ("like_collection", "Likecollection"), + ("feature_collection", "Featurecollection"), + ], + max_length=50, + ), + ), + ] diff --git a/social/templates/activity/feature_collection.html b/social/templates/activity/feature_collection.html new file mode 100644 index 00000000..800c2ad4 --- /dev/null +++ b/social/templates/activity/feature_collection.html @@ -0,0 +1,43 @@ +{% load static %} +{% load i18n %} +{% load l10n %} +{% load admin_url %} +{% load mastodon %} +{% load oauth_token %} +{% load truncate %} +{% load thumb %} +{% load prettydate %} +{% load user_actions %} + +{% like_piece_action activity.action_object as action %} +
++ +
+