test

files/views/pages.py

@@ -629,10 +629,12 @@ def view_media(request):
 
     if request.user.is_authenticated:
         if request.user.has_contributor_access_to_media(media) or is_mediacms_editor(request.user):
-            context["CAN_DELETE_MEDIA"] = True
             context["CAN_EDIT_MEDIA"] = True
             context["CAN_DELETE_COMMENTS"] = True
 
+        if request.user == media.user or is_mediacms_editor(request.user):
+            context["CAN_DELETE_MEDIA"] = True
+
     # in case media is video and is processing (eg the case a video was just uploaded)
     # attempt to show it (rather than showing a blank video player)
     if media.media_type == 'video':

frontend/src/static/js/components/media-page/ViewerInfoContent.js

@@ -217,16 +217,19 @@ export default function ViewerInfoContent(props) {
             />
           ) : null}
 
-          {userCan.editMedia || userCan.deleteMedia ? (
+          {userCan.editMedia ? (
             <div className="media-author-actions">
               {userCan.editMedia ? <EditMediaButton link={MediaPageStore.get('media-data').edit_url} /> : null}
 
+              {userCan.deleteMedia ? (
                 <PopupTrigger contentRef={popupContentRef}>
                   <button className="remove-media-icon" title={translateString('Delete media')}>
                     <i className="material-icons">delete</i>
                   </button>
                 </PopupTrigger>
+              ) : null}
 
+              {userCan.deleteMedia ? (
                 <PopupContent contentRef={popupContentRef}>
                   <PopupMain>
                     <div className="popup-message">
@@ -244,6 +247,7 @@ export default function ViewerInfoContent(props) {
                     </span>
                   </PopupMain>
                 </PopupContent>
+              ) : null}
             </div>
           ) : null}
         </div>