senaduka/old-new-wiaas
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Use custom capability to manage access to order delivery process

Browse Source
This commit is contained in:
Almira Krdzic
2018-12-03 12:20:47 +01:00
parent 2c0e217a49
commit c5f590c3fe
6 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/app/plugins/wiaas/includes/admin/delivery-process/class-wiaas-admin-delivery-process-flow.php
View File

@@ -42,7 +42,7 @@ class Wiaas_Admin_Order_Process_Flow {
if ($delivery_process && if ($delivery_process &&
wp_verify_nonce($_POST['wiaas_delivery_process_navigation_nonce'], 'wiaas_delivery_process_navigation') && wp_verify_nonce($_POST['wiaas_delivery_process_navigation_nonce'], 'wiaas_delivery_process_navigation') &&
GFAPI::current_user_can_any( 'gravityflow_workflow_detail_admin_actions' )) { GFAPI::current_user_can_any( 'manage_wiaas_order_delivery_process' )) {
self::_maybe_process_admin_step_change_action($delivery_process); self::_maybe_process_admin_step_change_action($delivery_process);

4
backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-admin-delivery-process-page.php
View File

@@ -64,7 +64,7 @@ if ( ! empty($delivery_process)) {
</h1> </h1>
<?php <?php
if (GFAPI::current_user_can_any( 'gravityflow_workflow_detail_admin_actions' )) { if (GFAPI::current_user_can_any( 'manage_wiaas_order_delivery_process' )) {
?> ?>
<p> <p>
@@ -106,7 +106,7 @@ if ( ! empty($delivery_process)) {
if (! empty($delivery_process)) { if (! empty($delivery_process)) {
if ($current_step && GFAPI::current_user_can_any( 'gravityflow_workflow_detail_admin_actions' )) { if ($current_step && GFAPI::current_user_can_any( 'manage_wiaas_order_delivery_process' )) {
require 'html-delivery-process-navigation.php'; require 'html-delivery-process-navigation.php';
} }

2
backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-delivery-process-step.php
View File

@@ -52,7 +52,7 @@ if ($is_current_step) {
$action_entry_step = $action_workflow->get_current_step($action_entry); $action_entry_step = $action_workflow->get_current_step($action_entry);
$show_entry = GFAPI::current_user_can_any( 'gravityflow_workflow_detail_admin_actions' ) || $show_entry = GFAPI::current_user_can_any( 'manage_wiaas_order_delivery_process' ) ||
($action_entry_step && ($action_entry_step &&
$action_entry_step->is_assignee($current_assignee_key)); $action_entry_step->is_assignee($current_assignee_key));

3
backend/app/plugins/wiaas/includes/class-wiaas-db-update.php
View File

@@ -29,7 +29,8 @@ class Wiaas_DB_Update {
'20181106133553' => 'wiaas_db_update_add_installation_date_delivery_action_form', '20181106133553' => 'wiaas_db_update_add_installation_date_delivery_action_form',
'20181125133553' => 'wiaas_db_update_add_country_settings_ui_fields', '20181125133553' => 'wiaas_db_update_add_country_settings_ui_fields',
'20181125143553' => 'wiaas_db_migration_fix_user_profile_addresses', // remove after migration '20181125143553' => 'wiaas_db_migration_fix_user_profile_addresses', // remove after migration
'20181125153553' => 'wiaas_db_migration_fix_countries' // remove after migration '20181125153553' => 'wiaas_db_migration_fix_countries', // remove after migration,
'20181203115826' => 'wiaas_db_update_add_administrator_delivery_process_capabilities'
); );
public static function execute() { public static function execute() {

2
backend/app/plugins/wiaas/includes/class-wiaas-delivery-process.php
View File

@@ -107,7 +107,7 @@ class Wiaas_Delivery_Process {
$delivery_process_entry = self::get_order_delivery_process_entry($order_id); $delivery_process_entry = self::get_order_delivery_process_entry($order_id);
} }
if (empty($delivery_process_entry) || ! GFAPI::current_user_can_any( 'gravityflow_workflow_detail_admin_actions' )) { if (empty($delivery_process_entry) || ! GFAPI::current_user_can_any( 'manage_wiaas_order_delivery_process' )) {
return false; return false;
} }

5
backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-roles.php
View File

@@ -324,3 +324,8 @@ function wiaas_db_update_enable_workflow_inbox_for_roles() {
wp_roles()->add_cap( 'commercial_lead', 'gravityflow_inbox' ); wp_roles()->add_cap( 'commercial_lead', 'gravityflow_inbox' );
} }
function wiaas_db_update_add_administrator_delivery_process_capabilities() {
wp_roles()->add_cap('administrator', 'manage_wiaas_order_delivery_process');
}