Skip to content

Fix PlacesResourcesMediaEvents creation when doing a BulkMediaUpload #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pollardld merged 1 commit into from
May 16, 2025
Merged

Fix PlacesResourcesMediaEvents creation when doing a BulkMediaUpload #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions TEKDB/TEKDB/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ def save_model(self, request, obj, form, change):
resources = form.cleaned_data.get('resources')
citations = form.cleaned_data.get('citations')
activities = form.cleaned_data.get('activities')
placeresources = form.cleaned_data.get('placeresources')
placesresources = form.cleaned_data.get('placesresources')

for file in request.FILES.getlist('files'):
mime_type, _ = guess_type(file.name)
Expand Down Expand Up @@ -493,9 +493,9 @@ def save_model(self, request, obj, form, change):
if activities:
for activity in activities:
ResourceActivityMediaEvents.objects.create(resourceactivityid=activity, mediaid=media_instance)
if placeresources:
for placeresource in placeresources:
PlaceResourceMediaEvents.objects.create(placeresourceid=placeresource, mediaid=media_instance)
if placesresources:
for placeresource in placesresources:
PlacesResourceMediaEvents.objects.create(placeresourceid=placeresource, mediaid=media_instance)


@admin.display(
Expand Down Expand Up @@ -579,7 +579,7 @@ def has_add_permission(self, request):
'enteredbyname', 'enteredbytribe','enteredbytitle','enteredbydate')
fieldsets = (
(None, {
'fields': ('mediabulkname', 'mediabulkdescription', 'files', 'mediabulkdate', 'places', 'resources', 'citations', 'activities', 'placeresources', 'thumbnail_gallery')
'fields': ('mediabulkname', 'mediabulkdescription', 'files', 'mediabulkdate', 'places', 'resources', 'citations', 'activities', 'placesresources', 'thumbnail_gallery')
}),
('History', {
'fields': (
Expand Down
10 changes: 5 additions & 5 deletions TEKDB/TEKDB/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django import forms
from django.contrib.admin.widgets import FilteredSelectMultiple
from .models import MediaBulkUpload, Media, Places, Resources, Citations, ResourcesActivityEvents, PlacesResourceMediaEvents
from .models import MediaBulkUpload, Media, Places, Resources, Citations, ResourcesActivityEvents, PlacesResourceEvents
from .widgets import ThumbnailFileInput


Expand Down Expand Up @@ -39,13 +39,13 @@ class MediaBulkUploadForm(forms.ModelForm):
required=False,
widget=FilteredSelectMultiple("Activities", is_stacked=False)
)
placeresources = forms.ModelMultipleChoiceField(
queryset=PlacesResourceMediaEvents.objects.all(),
placesresources = forms.ModelMultipleChoiceField(
queryset=PlacesResourceEvents.objects.all(),
required=False,
widget=FilteredSelectMultiple("Place Resources", is_stacked=False)
widget=FilteredSelectMultiple("Places Resources", is_stacked=False)
)

class Meta:
model = MediaBulkUpload
fields = ['mediabulkname', 'mediabulkdescription', 'mediabulkdate', 'files', 'places', 'resources', 'citations', 'activities', 'placeresources']
fields = ['mediabulkname', 'mediabulkdescription', 'mediabulkdate', 'files', 'places', 'resources', 'citations', 'activities', 'placesresources']

Loading