From d9d5256c5fa32a681ebb590db513c2a534885998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bobi=CC=81k?= Date: Tue, 4 Sep 2012 17:11:39 +0200 Subject: [PATCH] Issue #1773886 by Bobik: Added order status to access check in Commerce Order Views Edit/Delete link --- ...merce_order_handler_field_order_link_delete.inc | 2 ++ ...ommerce_order_handler_field_order_link_edit.inc | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/modules/order/includes/views/handlers/commerce_order_handler_field_order_link_delete.inc b/modules/order/includes/views/handlers/commerce_order_handler_field_order_link_delete.inc index 8a44fe0..2681192 100644 --- a/modules/order/includes/views/handlers/commerce_order_handler_field_order_link_delete.inc +++ b/modules/order/includes/views/handlers/commerce_order_handler_field_order_link_delete.inc @@ -8,6 +8,7 @@ class commerce_order_handler_field_order_link_delete extends commerce_order_hand parent::construct(); $this->additional_fields['uid'] = 'uid'; + $this->additional_fields['status'] = 'status'; } function render($values) { @@ -15,6 +16,7 @@ class commerce_order_handler_field_order_link_delete extends commerce_order_hand $order = commerce_order_new(); $order->order_id = $this->get_value($values, 'order_id'); $order->uid = $this->get_value($values, 'uid'); + $order->status = $this->get_value($values, 'status'); if (!commerce_order_access('update', $order)) { return; diff --git a/modules/order/includes/views/handlers/commerce_order_handler_field_order_link_edit.inc b/modules/order/includes/views/handlers/commerce_order_handler_field_order_link_edit.inc index abd3118..d0782e8 100644 --- a/modules/order/includes/views/handlers/commerce_order_handler_field_order_link_edit.inc +++ b/modules/order/includes/views/handlers/commerce_order_handler_field_order_link_edit.inc @@ -8,6 +8,7 @@ class commerce_order_handler_field_order_link_edit extends commerce_order_handle parent::construct(); $this->additional_fields['uid'] = 'uid'; + $this->additional_fields['status'] = 'status'; } function render($values) { @@ -15,7 +16,8 @@ class commerce_order_handler_field_order_link_edit extends commerce_order_handle $order = commerce_order_new(); $order->order_id = $this->get_value($values, 'order_id'); $order->uid = $this->get_value($values, 'uid'); - + $order->status = $this->get_value($values, 'status'); + if (!commerce_order_access('update', $order)) { return; } -- 1.7.4