From 5dc5289c7042dfcf44dfdcdc9321eac86ffd32c6 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Fri, 27 May 2016 12:09:47 +0200 Subject: [PATCH] Rerun. Tabbed dialogs allowed non access pages. --- inventory/manage/items.php | 5 ++--- js/inserts.js | 2 +- purchasing/manage/suppliers.php | 3 ++- sales/manage/customers.php | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/inventory/manage/items.php b/inventory/manage/items.php index ceb556fe..2cc9e47e 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -462,9 +462,8 @@ tabbed_content_start('tabs', array( $_SESSION["wa_current_user"]->can_access_page('SA_REORDER') ? $stock_id : null)), 'movement' => array(_('&Transactions'), ($_SESSION["wa_current_user"]->can_access_page('SA_ITEMSTRANSVIEW') ? $stock_id : null)), - 'status' => array(_('&Status'), $stock_id), - //'status' => array(_('&Status'), - // ($_SESSION["wa_current_user"]->can_access_page('SA_ITEMSSTATVIEW') ? $stock_id : null)), + 'status' => array(_('&Status'), + ($_SESSION["wa_current_user"]->can_access_page('SA_ITEMSSTATVIEW') ? $stock_id : null)), )); switch (get_post('_tabs_sel')) { diff --git a/js/inserts.js b/js/inserts.js index 0dd14165..8f03de7f 100644 --- a/js/inserts.js +++ b/js/inserts.js @@ -467,7 +467,7 @@ var inserts = { // ? var modifiedurl=ulistlink.getAttribute("href").replace(/^http:\/\/[^\/]+\//i, "http://"+window.location.hostname+"/") var url = tab.form.action tab.onclick=function(){ - if (!_hotkeys.alt && !tab.disabled) + if (!_hotkeys.alt && !this.disabled) _expand(this); return false; } diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php index d3e3df36..ec19e980 100644 --- a/purchasing/manage/suppliers.php +++ b/purchasing/manage/suppliers.php @@ -308,7 +308,8 @@ tabbed_content_start('tabs', array( 'contacts' => array(_('&Contacts'), $supplier_id), 'transactions' => array(_('&Transactions'), ($_SESSION["wa_current_user"]->can_access_page('SA_SUPPTRANSVIEW') ? $supplier_id : null)), - 'orders' => array(_('Purchase &Orders'), $supplier_id), + 'orders' => array(_('Purchase &Orders'), + ($_SESSION["wa_current_user"]->can_access_page('SA_SUPPTRANSVIEW') ? $supplier_id : null)), )); switch (get_post('_tabs_sel')) { diff --git a/sales/manage/customers.php b/sales/manage/customers.php index 87953187..a14bd205 100644 --- a/sales/manage/customers.php +++ b/sales/manage/customers.php @@ -349,7 +349,8 @@ tabbed_content_start('tabs', array( 'contacts' => array(_('&Contacts'), $selected_id), 'transactions' => array(_('&Transactions'), ($_SESSION["wa_current_user"]->can_access_page('SA_SALESTRANSVIEW') ? $selected_id : null)), - 'orders' => array(_('Sales &Orders'), $selected_id), + 'orders' => array(_('Sales &Orders'), + ($_SESSION["wa_current_user"]->can_access_page('SA_SALESTRANSVIEW') ? $selected_id : null)), )); switch (get_post('_tabs_sel')) { -- 2.30.2