diff --git a/TEKDB/TEKDB/admin.py b/TEKDB/TEKDB/admin.py index c4228a0..006435a 100644 --- a/TEKDB/TEKDB/admin.py +++ b/TEKDB/TEKDB/admin.py @@ -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) @@ -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( @@ -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': ( diff --git a/TEKDB/TEKDB/forms.py b/TEKDB/TEKDB/forms.py index 4373a62..aab2d27 100644 --- a/TEKDB/TEKDB/forms.py +++ b/TEKDB/TEKDB/forms.py @@ -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 @@ -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'] \ No newline at end of file