From dd52ff925309b9f2072980cf11fcc28fa32fd53f Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Tue, 25 Oct 2011 15:21:51 +0000 Subject: [PATCH] [*] BO : #PSFV-94 - added AdminProfilesController git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9639 b9a71923-0436-4b27-9f14-aed3839534dd --- admin-dev/themes/template/list_header.tpl | 2 +- controllers/admin/AdminProductsController.php | 14 ++-- .../admin/AdminProfilesController.php | 76 +++++++++---------- 3 files changed, 43 insertions(+), 49 deletions(-) rename admin-dev/tabs/AdminProfiles.php => controllers/admin/AdminProfilesController.php (53%) diff --git a/admin-dev/themes/template/list_header.tpl b/admin-dev/themes/template/list_header.tpl index db0591cf6..fb64308e7 100644 --- a/admin-dev/themes/template/list_header.tpl +++ b/admin-dev/themes/template/list_header.tpl @@ -64,7 +64,7 @@
{/if}{* End if simple_header *} - +
{if !$simple_header}
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 2ed1e024e..39163bbcc 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -24,7 +24,7 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ -include_once(_PS_ADMIN_DIR_.'/tabs/AdminProfiles.php'); + include_once('functions.php'); class AdminProductsController extends AdminController @@ -1707,7 +1707,7 @@ if (false) /** * initForm contains all necessary initialization needed for all tabs - * + * * @return void */ public function initForm() @@ -1743,7 +1743,7 @@ if (false) $action = 'Informations'; if(Tools::getValue('id_product')) { - // i is used as producttab id + // i is used as producttab id $i = 0; foreach($this->available_tabs as $product_tab) { @@ -3686,7 +3686,7 @@ switch ($this->action) $smarty->assign('minimal_quantity', $this->getFieldValue($obj, 'minimal_quantity') ? $this->getFieldValue($obj, 'minimal_quantity') : 1); $smarty->assign('available_date', ($this->getFieldValue($obj, 'available_date') != 0) ? stripslashes(htmlentities(Tools::displayDate($this->getFieldValue($obj, 'available_date'), $language['id_lang']))) : '0000-00-00'); // date picker include - + $i = 0; $smarty->assign('imageType', ImageType::getByNameNType('small', 'products')); @@ -3815,7 +3815,7 @@ switch ($this->action) $filename = $productDownload->filename; else $filename = ''; - // @todo : a better way to "fillCombinaison" maybe ? + // @todo : a better way to "fillCombinaison" maybe ? $content .= ' '.$this->l('Modify this combination').'action) else $content .= ''.$this->l('You must save this product before adding combinations').'.'; $this->context->smarty->assign('content', $content); - // @todo + // @todo $smarty->assign('up_filename', strval(Tools::getValue('virtual_product_filename_attribute'))); - + $this->content = $this->context->smarty->fetch('products/combinations.tpl'); } diff --git a/admin-dev/tabs/AdminProfiles.php b/controllers/admin/AdminProfilesController.php similarity index 53% rename from admin-dev/tabs/AdminProfiles.php rename to controllers/admin/AdminProfilesController.php index 9bee579fc..bdfae46ee 100644 --- a/admin-dev/tabs/AdminProfiles.php +++ b/controllers/admin/AdminProfilesController.php @@ -1,6 +1,6 @@ context = Context::getContext(); + $this->context = Context::getContext(); $this->table = 'profile'; $this->className = 'Profile'; $this->lang = true; - $this->edit = true; - $this->delete = true; - + $this->addRowAction('edit'); + $this->addRowAction('delete'); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); + $this->fieldsDisplay = array( - 'id_profile' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25), - 'name' => array('title' => $this->l('Name'), 'width' => 200)); + 'id_profile' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25), + 'name' => array('title' => $this->l('Name'), 'width' => 200)); $this->identifier = 'id_profile'; - + + $this->fields_form = array( + 'legend' => array( + 'title' => $this->l('Profils'), + 'image' => '../img/admin/profiles.png' + ), + 'input' => array( + array( + 'type' => 'text', + 'label' => $this->l('Name:'), + 'name' => 'name', + 'size' => 33, + 'required' => true, + 'lang' => true, + 'attributeLang' => 'name', + ) + ), + 'submit' => array( + 'title' => $this->l(' Save '), + 'class' => 'button' + ) + ); + $list_profile = array(); foreach(Profile::getProfiles($this->context->language->id) as $profil) $list_profile[] = array('value' => $profil['id_profile'], 'name' => $profil['name']); - + parent::__construct(); } - + public function postProcess() { /* PrestaShop demo mode */ @@ -57,41 +80,12 @@ class AdminProfiles extends AdminTab return; } /* PrestaShop demo mode*/ - + if (isset($_GET['delete'.$this->table]) AND $_GET[$this->identifier] == (int)(_PS_ADMIN_PROFILE_)) $this->_errors[] = $this->l('For security reasons, you cannot delete the Administrator profile'); else parent::postProcess(); } - - public function displayForm($isMainTab = true) - { - parent::displayForm(); - - if (!($obj = $this->loadObject(true))) - return; - - echo ' - - '.($obj->id ? '' : '').' -
'.$this->l('Profiles').' - -
'; - foreach ($this->_languages as $language) - echo ' -
- * -
'; - $this->displayFlags($this->_languages, $this->_defaultFormLanguage, 'name', 'name'); - echo '
-
-
- -
-
* '.$this->l('Required field').'
-
- '; - } }