Changeset 32686

Timestamp:

06/03/2015 03:07:22 PM (11 years ago)

Author:

helen

Message:

List tables: tighten up primary column handling for plugins and multisite themes.

These shouldn't be able to have their primary column reassigned by default. Also removes the has-row-actions class as these list tables always have row actions visible and the JS for visual toggling conflicts. The column-primary class remains.

props stephdau.
see #25408.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-ms-themes-list-table.php (modified) (5 diffs)
• class-wp-plugins-list-table.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -246 +246 @@
 
         /**
-         * Get the name of the default primary column.
+         * Get the name of the primary column.
          *
          * @since 4.3.0
          * @access protected
          *
-         * @return string Name of the default primary column name, in this case, 'name'.
-         */
-        protected function get_default_primary_column_name() {
+         * @return string Unalterable name of the primary column name, in this case, 'name'.
+         */
+        protected function get_primary_column_name() {
                 return 'name';
         }
@@ -439 +439 @@
                                 $style = ' style="display:none;"';
 
+                        $extra_class = '';
+                        if ( $primary === $column_name ) {
+                                $extra_class = ' column-primary';
+                        }
+
                         switch ( $column_name ) {
                                 case 'cb':
@@ -444 +449 @@
                                         break;
                                 case 'name':
-                                        echo "<td class='theme-title'$style><strong>" . $theme->display('Name') . "</strong>";
+                                        echo "<td class='theme-title{$extra_class}'$style><strong>" . $theme->display('Name') . "</strong>";
                                         if ( $primary === $column_name ) {
                                                 echo $this->row_actions($actions, true);
@@ -451 +456 @@
                                         break;
                                 case 'description':
-                                        echo "<td class='column-description desc'$style>";
+                                        echo "<td class='column-description desc{$extra_class}'$style>";
                                         if ( $theme->errors() ) {
                                                 $pre = $status == 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
@@ -493 +498 @@
 
                                 default:
-                                        echo "<td class='$column_name column-$column_name'$style>";
+                                        echo "<td class='$column_name column-$column_name{$extra_class}'$style>";
 
                                         /**

trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -582 +582 @@
                 list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
 
-                $extra_class = ' has-row-actions column-primary';
+                $extra_class = ' column-primary';
 
                 foreach ( $columns as $column_name => $column_display_name ) {
@@ -720 +720 @@
 
         /**
-         * Get the name of default primary column for this specific list table.
+         * Get the name of primary column for this specific list table.
          *
          * @since 4.3.0
          * @access protected
          *
-         * @return string Name for the default primary column, in this case, 'plugin'.
-         */
-        protected function get_default_primary_column_name() {
+         * @return string Unalterable name for the primary column, in this case, 'plugin'.
+         */
+        protected function get_primary_column_name() {
                 return 'plugin';
         }