dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// CSS fixes

Browse Source
This commit is contained in:
Damien Metzger
2013-10-09 15:11:04 +02:00
parent 9fcb039068
commit a2371067bf
5 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCategoriesController.php
+4 -5
View File
@@ -623,7 +623,7 @@ class AdminCategoriesControllerCore extends AdminController
if ($this->delete_mode == 'linkanddisable')
$this->disable_products = true;
}
else if ($this->delete_mode != 'delete')
elseif ($this->delete_mode != 'delete')
$this->errors[] = Tools::displayError('Unknown delete mode:'.' '.$this->deleted);
}
@@ -656,22 +656,21 @@ class AdminCategoriesControllerCore extends AdminController
public function processDelete()
{
$category = $this->loadObject();
if ($this->tabAccess['delete'] === '1')
{
$category = $this->loadObject();
if ($category->isRootCategoryForAShop())
$this->errors[] = Tools::displayError('You cannot remove this category because one of your shops uses it as a root category.');
else if (parent::processDelete())
elseif (parent::processDelete())
{
$this->setDeleteMode();
$this->processFatherlessProducts((int)$category->id_parent);
return true;
}
else
return false;
}
else
$this->errors[] = Tools::displayError('You do not have permission to delete this.');
return false;
}
public function processFatherlessProducts($id_parent)
controllers/admin/AdminProductsController.php
+1 -1
View File
@@ -3431,7 +3431,7 @@ class AdminProductsControllerCore extends AdminController
))->fetch()
.'</div>'
.'<div class="form-group">'
.'<input type="checkbox" name="require_'.$type.'_'.(int)($id_customization_field).'" id="require_'.$type.'_'.(int)($id_customization_field).'" value="1" '.($required ? 'checked="checked"' : '').' style="float: left; margin: 0 4px"/><label for="require_'.$type.'_'.(int)($id_customization_field).'" style="float: none; font-weight: normal;"> '.$this->l('required').'</label>'
.'<input type="checkbox" name="require_'.$type.'_'.(int)($id_customization_field).'" id="require_'.$type.'_'.(int)($id_customization_field).'" value="1" '.($required ? 'checked="checked"' : '').' style="float:left;margin:1px 4px 0 0"/><label for="require_'.$type.'_'.(int)($id_customization_field).'" style="float:none;font-weight:normal"> '.$this->l('Required').'</label>'
.'</div>';
}