From 22432389b78ae73c97366285b5bd1ad2c8bcd826 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Thu, 8 Dec 2011 15:41:12 +0000 Subject: [PATCH] // adding ovverride method initProcess for display Informations Tab --- admin-dev/themes/default/admin.css | 1 + controllers/admin/AdminHomeController.php | 4 +- controllers/admin/AdminProductsController.php | 38 +++++++++++++------ 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css index f45dfbb7f..97eefbdf9 100644 --- a/admin-dev/themes/default/admin.css +++ b/admin-dev/themes/default/admin.css @@ -118,6 +118,7 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3} .table tr td{border-bottom:1px solid #ccc;color:#333;font-size:11px;padding: 4px 4px 4px 6px;} .table tr:hover td{background:#fff1b5} .table tr.filter:hover td{background:#F1F9FF} +.table tr td:hover table tr td{background:none} .table tr.action_details td{background:#FAFAFA;} .table tr.alt_row.action_details td{background:#E8E8E8;} .table tr td.empty{border-bottom:none;background:white!important} diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index 7c98de3c1..02c576c72 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -171,13 +171,13 @@ class AdminHomeControllerCore extends AdminController private function getQuickLinks() { $quick_links['first'] = array( - 'href' => $this->context->link->getAdminLink('AdminCatalog').'&addcategory', + 'href' => $this->context->link->getAdminLink('AdminCategories').'&addcategory', 'title' => $this->l('New category'), 'description' => $this->l('Create a new category and organize your products.'), ); $quick_links['second'] = array( - 'href' => $this->context->link->getAdminLink('AdminCatalog').'&addproduct', + 'href' => $this->context->link->getAdminLink('AdminProducts').'&addproduct', 'title' => $this->l('New product'), 'description' => $this->l('Fill up your catalog with new articles and attributes.'), ); diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index bc3e68bcd..c444b3a4e 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1509,8 +1509,8 @@ class AdminProductsControllerCore extends AdminController // Trick's if ($edit == 1) { - $id_product_download_attribute = ProductDownload::getIdFromIdAttribute((int) $product->id, $id_product_attribute); - $id_product_download = ($id_product_download_attribute) ? (int) $id_product_download_attribute : (int) Tools::getValue('virtual_product_id'); + $id_product_download_attribute = ProductDownload::getIdFromIdAttribute((int)$product->id, $id_product_attribute); + $id_product_download = ($id_product_download_attribute) ? (int)$id_product_download_attribute : (int)Tools::getValue('virtual_product_id'); } else $id_product_download = Tools::getValue('virtual_product_id'); @@ -1551,16 +1551,16 @@ class AdminProductsControllerCore extends AdminController $filename = ProductDownload::getNewFilename(); $download = new ProductDownload($id_product_download); - $download->id_product = (int) $product->id; - $download->id_product_attribute = (int) $id_product_attribute; + $download->id_product = (int)$product->id; + $download->id_product_attribute = (int)$id_product_attribute; $download->display_filename = $virtual_product_name; $download->filename = $filename; $download->date_add = date('Y-m-d H:i:s'); $download->date_expiration = $virtual_product_expiration_date ? $virtual_product_expiration_date.' 23:59:59' : ''; - $download->nb_days_accessible = (int) $virtual_product_nb_days; - $download->nb_downloadable = (int) $virtual_product_nb_downloable; + $download->nb_days_accessible = (int)$virtual_product_nb_days; + $download->nb_downloadable = (int)$virtual_product_nb_downloable; $download->active = 1; - $download->is_shareable = (int) $is_shareable; + $download->is_shareable = (int)$is_shareable; if ($download->save()) return true; @@ -1570,8 +1570,8 @@ class AdminProductsControllerCore extends AdminController /* unactive download product if checkbox not checked */ if ($edit == 1) { - $id_product_download_attribute = ProductDownload::getIdFromIdAttribute((int) $product->id, $id_product_attribute); - $id_product_download = ($id_product_download_attribute) ? (int) $id_product_download_attribute : (int) Tools::getValue('virtual_product_id'); + $id_product_download_attribute = ProductDownload::getIdFromIdAttribute((int)$product->id, $id_product_attribute); + $id_product_download = ($id_product_download_attribute) ? (int)$id_product_download_attribute : (int)Tools::getValue('virtual_product_id'); } else $id_product_download = ProductDownload::getIdFromIdProduct($product->id); @@ -1636,14 +1636,29 @@ class AdminProductsControllerCore extends AdminController /* Assign tags to this product */ foreach ($languages as $language) if ($value = Tools::getValue('tags_'.$language['id_lang'])) - $tagError &= Tag::addTags($language['id_lang'], (int)($product->id), $value); + $tagError &= Tag::addTags($language['id_lang'], (int)$product->id, $value); return $tagError; } + public function initProcess() + { + parent::initProcess(); + if (isset($_GET['add'.$this->table])) + { + if ($this->tabAccess['add'] === '1') + { + $this->action = 'Informations'; + } + else + $this->_errors[] = Tools::displayError('You do not have permission to add here.'); + } + } + public function initContent($token = null) { if ($this->action == 'save') $this->action = ''; + // this is made to "save and stay" feature $this->tpl_form_vars['show_product_tab_content'] = Tools::getValue('action'); if (Tools::getValue('id_product') || ((Tools::isSubmit('submitAddproduct') OR Tools::isSubmit('submitAddproductAndPreview') OR Tools::isSubmit('submitAddproductAndStay') OR Tools::isSubmit('submitSpecificPricePriorities') OR Tools::isSubmit('submitPriceAddition') OR Tools::isSubmit('submitPricesModification')) AND count($this->_errors)) OR Tools::isSubmit('updateproduct') OR Tools::isSubmit('addproduct')) @@ -1694,9 +1709,8 @@ class AdminProductsControllerCore extends AdminController $this->tpl_form_vars['tabs_toolbar_save_buttons'] = $this->tabs_toolbar_save_buttons; } - $languages = Language::getLanguages(false); - $default_language = (int)(Configuration::get('PS_LANG_DEFAULT')); + $default_language = (int)Configuration::get('PS_LANG_DEFAULT'); } else {