Merge branch 'develop' into gli-2929_2
This commit is contained in:
@@ -91,13 +91,22 @@ class AdminFeaturesControllerCore extends AdminController
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
public function init()
|
||||
{
|
||||
parent::init();
|
||||
|
||||
if (($id = Tools::getValue('id_feature')) && Tools::getIsset('viewfeature')) {
|
||||
self::$currentIndex .= '&id_feature='.(int)$id.'&viewfeature';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* AdminController::renderList() override
|
||||
* @see AdminController::renderList()
|
||||
*/
|
||||
public function renderList()
|
||||
{
|
||||
/*$this->addRowAction('view');*//*by webkul*/
|
||||
$this->addRowAction('view');
|
||||
$this->addRowAction('edit');
|
||||
$this->addRowAction('delete');
|
||||
|
||||
@@ -154,7 +163,6 @@ class AdminFeaturesControllerCore extends AdminController
|
||||
);
|
||||
|
||||
$this->_where = sprintf('AND `id_feature` = %d', (int)$id);
|
||||
self::$currentIndex = self::$currentIndex.'&id_feature='.(int)$id.'&viewfeature';
|
||||
$this->processFilter();
|
||||
return parent::renderList();
|
||||
}
|
||||
@@ -322,8 +330,14 @@ class AdminFeaturesControllerCore extends AdminController
|
||||
break;
|
||||
|
||||
case 'view':
|
||||
$bread_extended[] = $this->feature_name[$this->context->employee->id_lang];
|
||||
$this->addMetaTitle($bread_extended[count($bread_extended) - 1]);
|
||||
if (!$this->feature_name && ($id = Tools::getValue('id_feature'))) {
|
||||
$obj = new Feature((int)$id);
|
||||
$this->feature_name = $obj->name;
|
||||
}
|
||||
if ($this->feature_name) {
|
||||
$bread_extended[] = $this->feature_name[$this->context->employee->id_lang];
|
||||
$this->addMetaTitle($bread_extended[count($bread_extended) - 1]);
|
||||
}
|
||||
break;
|
||||
|
||||
case 'editFeatureValue':
|
||||
@@ -334,7 +348,7 @@ class AdminFeaturesControllerCore extends AdminController
|
||||
}
|
||||
|
||||
if (Validate::isLoadedObject($obj = new FeatureValue((int)Tools::getValue('id_feature_value')))) {
|
||||
$bread_extended[] = sprintf($this->l('Edit: %s'), $obj->value[$this->context->employee->id_lang]);
|
||||
$bread_extended[] = sprintf($this->l('Edit: %s'), $obj->value[$this->context->employee->id_lang]);
|
||||
}
|
||||
} else {
|
||||
$bread_extended[] = $this->l('Edit Value');
|
||||
@@ -549,13 +563,15 @@ class AdminFeaturesControllerCore extends AdminController
|
||||
{
|
||||
$object = parent::processAdd();
|
||||
|
||||
if (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && !count($this->errors)) {
|
||||
if ($this->table == 'feature_value' && ($this->display == 'edit' || $this->display == 'add')) {
|
||||
$this->redirect_after = self::$currentIndex.'&addfeature_value&id_feature='.(int)Tools::getValue('id_feature').'&token='.$this->token;
|
||||
if ('feature_value' === $this->table && !count($this->errors)) {
|
||||
if (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && ($this->display == 'edit' || $this->display == 'add')) {
|
||||
$this->redirect_after = self::$currentIndex.'&addfeature_value&id_feature='.(int)Tools::getValue('id_feature').'&conf=3&token='.$this->token;
|
||||
} else {
|
||||
$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.(int) $object->id.'&conf=3&update'.$this->table.'&token='.$this->token;
|
||||
$this->redirect_after = self::$currentIndex.'&id_feature='.(int)Tools::getValue('id_feature').'&viewfeature&conf=3&token='.$this->token;
|
||||
}
|
||||
} elseif (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && count($this->errors) && $this->table == 'feature_value') { // enter only if feature is submitted
|
||||
} elseif (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && !count($this->errors)) {
|
||||
$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.(int) $object->id.'&conf=3&update'.$this->table.'&token='.$this->token;
|
||||
} elseif (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && count($this->errors) && 'feature_value' === $this->table) { // enter only if feature is submitted
|
||||
$this->display = 'editFeatureValue';
|
||||
}
|
||||
|
||||
@@ -570,8 +586,14 @@ class AdminFeaturesControllerCore extends AdminController
|
||||
{
|
||||
$object = parent::processUpdate();
|
||||
|
||||
if (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && !count($this->errors)) {
|
||||
$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.(int) Tools::getValue('id_feature').'&conf=4&update'.$this->table.'&token='.$this->token;
|
||||
if ('feature_value' === $this->table && !count($this->errors)) {
|
||||
if (Tools::isSubmit('submitAdd'.$this->table.'AndStay')) {
|
||||
$this->redirect_after = self::$currentIndex.'&addfeature_value&id_feature='.(int)Tools::getValue('id_feature').'&conf=4&token='.$this->token;
|
||||
} else {
|
||||
$this->redirect_after = self::$currentIndex.'&id_feature='.(int)Tools::getValue('id_feature').'&viewfeature&conf=4&token='.$this->token;
|
||||
}
|
||||
} elseif (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && !count($this->errors)) {
|
||||
$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.(int)$object->id.'&conf=4&update'.$this->table.'&token='.$this->token;
|
||||
}
|
||||
|
||||
return $object;
|
||||
@@ -628,24 +650,12 @@ class AdminFeaturesControllerCore extends AdminController
|
||||
$this->errors[] = $this->l('Some error occurred while uploding stay feature logo. Please try again.');
|
||||
}
|
||||
}
|
||||
|
||||
if ($featureValues = FeatureValue::getFeatureValuesWithLang(
|
||||
$this->context->language->id,
|
||||
$objFeature->id
|
||||
)) {
|
||||
$objFeatureValue = new FeatureValue($featureValues[0]['id_feature_value']);
|
||||
} else {
|
||||
$objFeatureValue = new FeatureValue();
|
||||
}
|
||||
|
||||
$objFeatureValue->id_feature = $objFeature->id;
|
||||
foreach (Language::getLanguages(true) as $lang) {
|
||||
$objFeatureValue->value[$lang['id_lang']] = $objFeature->id.'.jpg';
|
||||
}
|
||||
$objFeatureValue->save();
|
||||
return $objFeature;
|
||||
}
|
||||
|
||||
return $objFeature;
|
||||
}
|
||||
|
||||
return parent::processSave();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user