Some upload/alt tag fixes.

* Ensure that non-admins can upload and edit images. * Don't double-add alt tag notice. See #107, #118.
openlab-at-city-tech · May 4, 2018 · bf13d5c · bf13d5c
1 parent c4f129a
commit bf13d5c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/build/index.js b/build/index.js
@@ -40054,7 +40054,9 @@ const mapDispatchToProps = (dispatch, ownProps) => {
 						frame.reset();
 					} else {
 						const warning = '<p id="alt-tag-warning" class="alt-tag-warning">You must supply alt text before inserting this image.</p>';
+						toolbarView.$el.find('#alt-tag-warning').remove();
 						toolbarView.$el.find('.media-toolbar-primary').append(warning);
+						console.log(sidebar);
 						sidebar.$el.find('label.setting[data-setting="alt"]').addClass('has-error');
 					}
 				});

diff --git a/build/index.js.map b/build/index.js.map
diff --git a/classes/Server.php b/classes/Server.php
@@ -344,7 +344,7 @@ public function enqueue_redirector_script() {
 	 * @return array $caps
 	 */
 	public static function map_meta_cap( $caps, $cap, $user_id, $args ) {
-		if ( 'upload_files' !== $cap ) {
+		if ( 'upload_files' !== $cap && 'edit_post' !== $cap ) {
 			return $caps;
 		}
 
@@ -353,6 +353,22 @@ public static function map_meta_cap( $caps, $cap, $user_id, $args ) {
 			return $caps;
 		}
 
+		$can = false;
+		switch ( $cap ) {
+			case 'upload_files' :
+				$can = true;
+			break;
+
+			case 'edit_post' :
+				$post = get_post( $args[0] );
+				$can = $post && $user_id === $post->post_author;
+			break;
+		}
+
+		if ( $can ) {
+			$caps = array( 'exist' );
+		}
+
 		// @todo Better filtering?
 		return array( 'exist' );
 	}

diff --git a/src/containers/UploaderContainer.js b/src/containers/UploaderContainer.js
@@ -86,7 +86,9 @@ const mapDispatchToProps = (dispatch, ownProps) => {
 						frame.reset()
 					} else {
 						const warning = '<p id="alt-tag-warning" class="alt-tag-warning">You must supply alt text before inserting this image.</p>'
+						toolbarView.$el.find('#alt-tag-warning').remove()
 						toolbarView.$el.find('.media-toolbar-primary').append(warning)
+						console.log(sidebar);
 						sidebar.$el.find('label.setting[data-setting="alt"]').addClass('has-error')
 					}
 				})