Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10285 from shivapoudel/row-actions 

Both row actions can be check in single condition ;)
This commit is contained in:
Mike Jolley 2016-02-08 09:55:14 +00:00
parent ad235bbcea 1c856181d2
commit f9edc6a14a
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
includes/admin/class-wc-admin-post-types.php
View File

@ -417,7 +417,7 @@ class WC_Admin_Post_Types {
* Since WordPress 4.3 we don't have to build the row actions.
*
* @param WP_Post $post
* @param string $title
* @param string $title
*/
private function _render_product_row_actions( $post, $title ) {
global $wp_version;
@ -550,7 +550,7 @@ class WC_Admin_Post_Types {
* Since WordPress 4.3 we don't have to build the row actions.
*
* @param WP_Post $post
* @param string $title
* @param string $title
*/
private function _render_shop_coupon_row_actions( $post, $title ) {
global $wp_version;
@ -598,7 +598,7 @@ class WC_Admin_Post_Types {
/**
* Output custom columns for coupons.
* @param string $column
* @param string $column
*/
public function render_shop_order_columns( $column ) {
global $post, $woocommerce, $the_order;
@ -809,7 +809,7 @@ class WC_Admin_Post_Types {
/**
* Make columns sortable - https://gist.github.com/906872.
*
* @param array $columns
* @param array $columns
* @return array
*/
public function product_sortable_columns( $columns ) {
@ -825,7 +825,7 @@ class WC_Admin_Post_Types {
/**
* Make columns sortable - https://gist.github.com/906872.
*
* @param array $columns
* @param array $columns
* @return array
*/
public function shop_coupon_sortable_columns( $columns ) {
@ -835,7 +835,7 @@ class WC_Admin_Post_Types {
/**
* Make columns sortable - https://gist.github.com/906872.
*
* @param array $columns
* @param array $columns
* @return array
*/
public function shop_order_sortable_columns( $columns ) {
@ -903,13 +903,7 @@ class WC_Admin_Post_Types {
return array_merge( array( 'id' => 'ID: ' . $post->ID ), $actions );
}
if ( 'shop_order' === $post->post_type ) {
if ( isset( $actions['inline hide-if-no-js'] ) ) {
unset( $actions['inline hide-if-no-js'] );
}
}
if ( 'shop_coupon' === $post->post_type ) {
if ( in_array( $post->post_type, array( 'shop_order', 'shop_coupon' ) ) ) {
if ( isset( $actions['inline hide-if-no-js'] ) ) {
unset( $actions['inline hide-if-no-js'] );
}
@ -923,13 +917,13 @@ class WC_Admin_Post_Types {
*
* Based on Simple Page Ordering by 10up (http://wordpress.org/extend/plugins/simple-page-ordering/).
*
* @param array $views
* @param array $views
* @return array
*/
public function product_sorting_link( $views ) {
global $post_type, $wp_query;
if ( ! current_user_can('edit_others_pages') ) {
if ( ! current_user_can( 'edit_others_pages' ) ) {
return $views;
}