From 6b6a665828a70069a4f8b6bf11fca9edb1238143 Mon Sep 17 00:00:00 2001 From: Brian Miyaji Date: Fri, 20 Jun 2014 14:26:14 +1000 Subject: [PATCH] Improve roles and permissions --- includes/class-sp-install.php | 62 +++++++++++++++++++++++++++--- includes/class-sp-league-table.php | 2 +- includes/class-sp-post-types.php | 2 +- includes/sp-template-hooks.php | 2 +- 4 files changed, 60 insertions(+), 8 deletions(-) diff --git a/includes/class-sp-install.php b/includes/class-sp-install.php index f60c7977..284ebe39 100644 --- a/includes/class-sp-install.php +++ b/includes/class-sp-install.php @@ -174,6 +174,21 @@ class SP_Install { 'delete_sp_players' => true, 'edit_published_sp_players' => true, + 'edit_sp_event' => true, + 'read_sp_event' => true, + 'edit_sp_events' => true, + 'edit_published_sp_events' => true, + + 'edit_sp_team' => true, + 'read_sp_team' => true, + 'edit_sp_teams' => true, + 'edit_published_sp_teams' => true, + + 'edit_sp_staff' => true, + 'read_sp_staff' => true, + 'edit_sp_staffs' => true, + 'edit_published_sp_staffs' => true, + 'assign_sp_player_terms' => true, ) ); @@ -200,6 +215,21 @@ class SP_Install { 'delete_sp_staffs' => true, 'edit_published_sp_staffs' => true, + 'edit_sp_event' => true, + 'read_sp_event' => true, + 'edit_sp_events' => true, + 'edit_published_sp_events' => true, + + 'edit_sp_team' => true, + 'read_sp_team' => true, + 'edit_sp_teams' => true, + 'edit_published_sp_teams' => true, + + 'edit_sp_player' => true, + 'read_sp_player' => true, + 'edit_sp_players' => true, + 'edit_published_sp_players' => true, + 'assign_sp_staff_terms' => true, ) ); @@ -226,6 +256,21 @@ class SP_Install { 'delete_published_sp_events' => true, 'edit_published_sp_events' => true, + 'edit_sp_team' => true, + 'read_sp_team' => true, + 'edit_sp_teams' => true, + 'edit_published_sp_teams' => true, + + 'edit_sp_player' => true, + 'read_sp_player' => true, + 'edit_sp_players' => true, + 'edit_published_sp_players' => true, + + 'edit_sp_staff' => true, + 'read_sp_staff' => true, + 'edit_sp_staffs' => true, + 'edit_published_sp_staffs' => true, + 'assign_sp_event_terms' => true, ) ); @@ -250,7 +295,6 @@ class SP_Install { 'read_sp_player' => true, 'delete_sp_player' => true, 'edit_sp_players' => true, - 'edit_others_sp_players' => true, 'publish_sp_players' => true, 'delete_sp_players' => true, 'delete_published_sp_players' => true, @@ -260,7 +304,7 @@ class SP_Install { 'read_sp_staff' => true, 'delete_sp_staff' => true, 'edit_sp_staffs' => true, - 'edit_others_sp_staffs' => true, + 'publish_sp_staffs' => true, 'delete_sp_staffs' => true, 'delete_published_sp_staffs' => true, 'edit_published_sp_staffs' => true, @@ -279,18 +323,26 @@ class SP_Install { 'read_sp_event' => true, 'delete_sp_event' => true, 'edit_sp_events' => true, - 'edit_others_sp_events' => true, + 'publish_sp_events' => true, 'delete_sp_events' => true, 'delete_published_sp_events' => true, 'edit_published_sp_events' => true, 'edit_sp_team' => true, 'read_sp_team' => true, - 'delete_sp_team' => true, 'edit_sp_teams' => true, - 'delete_sp_teams' => true, 'edit_published_sp_teams' => true, + 'edit_sp_list' => true, + 'read_sp_list' => true, + 'delete_sp_list' => true, + 'edit_sp_lists' => true, + 'publish_sp_lists' => true, + 'delete_sp_lists' => true, + 'delete_published_sp_lists' => true, + 'edit_published_sp_lists' => true, + + 'edit_sp_team_columns' => true, 'edit_sp_player_statistics' => true, ) ); diff --git a/includes/class-sp-league-table.php b/includes/class-sp-league-table.php index c38ca2b6..ed371d47 100644 --- a/includes/class-sp-league-table.php +++ b/includes/class-sp-league-table.php @@ -83,7 +83,7 @@ class SP_League_Table extends SP_Custom_Post{ $static = get_post_meta( $team_id, 'sp_columns', true ); // Add static stats to placeholders - $placeholders[ $team_id ] = sp_array_value( $static, $div_id, array() ); + $placeholders[ $team_id ] = sp_array_value( sp_array_value( $static, $league_id, array() ), $div_id, array() ); endforeach; diff --git a/includes/class-sp-post-types.php b/includes/class-sp-post-types.php index 9092a91c..2dad7861 100644 --- a/includes/class-sp-post-types.php +++ b/includes/class-sp-post-types.php @@ -447,7 +447,7 @@ class SP_Post_types { 'exclude_from_search' => false, 'hierarchical' => false, 'rewrite' => array( 'slug' => get_option( 'sportspress_table_slug', 'table' ) ), - 'supports' => array( 'title', 'author', 'thumbnail' ), + 'supports' => array( 'title', 'page-attributes', 'thumbnail' ), 'has_archive' => false, 'show_in_nav_menus' => true, 'show_in_menu' => 'edit.php?post_type=sp_team', diff --git a/includes/sp-template-hooks.php b/includes/sp-template-hooks.php index 14159840..d27de924 100644 --- a/includes/sp-template-hooks.php +++ b/includes/sp-template-hooks.php @@ -159,7 +159,7 @@ function sportspress_gettext( $translated_text, $untranslated_text, $domain ) { endswitch; endif; - if ( in_array( $typenow, array( 'sp_event', 'sp_team', 'sp_player', 'sp_staff' ) ) ): + if ( in_array( $typenow, array( 'sp_event', 'sp_team', 'sp_player', 'sp_list', 'sp_staff' ) ) ): switch ( $untranslated_text ): case 'Author': $translated_text = __( 'User', 'sportspress' );