mirror of
https://github.com/mediacms-io/mediacms.git
synced 2025-11-06 07:28:53 -05:00
feat: 3 small fixes (#1347)
* fix: datetime input * show message on upload user only * show all media of user for editors/managers/admins
This commit is contained in:
parent
02eac68b51
commit
e9f862a0ff
@ -35,7 +35,7 @@ class MediaMetadataForm(forms.ModelForm):
|
|||||||
widgets = {
|
widgets = {
|
||||||
"new_tags": MultipleSelect(),
|
"new_tags": MultipleSelect(),
|
||||||
"description": forms.Textarea(attrs={'rows': 4}),
|
"description": forms.Textarea(attrs={'rows': 4}),
|
||||||
"add_date": forms.DateInput(attrs={'type': 'date'}, format='%Y-%m-%d'),
|
"add_date": forms.DateTimeInput(attrs={'type': 'datetime-local', 'step': '1'}, format='%Y-%m-%dT%H:%M:%S'),
|
||||||
"thumbnail_time": forms.NumberInput(attrs={'min': 0, 'step': 0.1}),
|
"thumbnail_time": forms.NumberInput(attrs={'min': 0, 'step': 0.1}),
|
||||||
}
|
}
|
||||||
labels = {
|
labels = {
|
||||||
|
|||||||
@ -132,7 +132,7 @@ class MediaList(APIView):
|
|||||||
elif author_param:
|
elif author_param:
|
||||||
user_queryset = User.objects.all()
|
user_queryset = User.objects.all()
|
||||||
user = get_object_or_404(user_queryset, username=author_param)
|
user = get_object_or_404(user_queryset, username=author_param)
|
||||||
if self.request.user == user:
|
if self.request.user == user or is_mediacms_editor(self.request.user):
|
||||||
media = Media.objects.filter(user=user).prefetch_related("user").order_by("-add_date")
|
media = Media.objects.filter(user=user).prefetch_related("user").order_by("-add_date")
|
||||||
else:
|
else:
|
||||||
media = self._get_media_queryset(request, user)
|
media = self._get_media_queryset(request, user)
|
||||||
|
|||||||
@ -574,7 +574,7 @@ def view_media(request):
|
|||||||
video_msg = "Media encoding hasn't started yet. Attempting to show the original video file"
|
video_msg = "Media encoding hasn't started yet. Attempting to show the original video file"
|
||||||
if media.encoding_status == "running":
|
if media.encoding_status == "running":
|
||||||
video_msg = "Media encoding is under processing. Attempting to show the original video file"
|
video_msg = "Media encoding is under processing. Attempting to show the original video file"
|
||||||
if video_msg:
|
if video_msg and media.user == request.user:
|
||||||
messages.add_message(request, messages.INFO, video_msg)
|
messages.add_message(request, messages.INFO, video_msg)
|
||||||
|
|
||||||
return render(request, "cms/media.html", context)
|
return render(request, "cms/media.html", context)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user