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

// bugfix url rewrite javascript, fix redirectAdmin token when toggle status

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9715 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-10-28 13:37:24 +00:00
parent 71ecfb917b
commit 4f4609e980
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminProductsController.php
+4 -3
View File
@@ -347,8 +347,9 @@ class AdminProductsController extends AdminController
{ {
if (Validate::isLoadedObject($object = $this->loadObject())) if (Validate::isLoadedObject($object = $this->loadObject()))
{ {
// @todo : redirect to the previous page instead of always product list
if ($object->toggleStatus()) if ($object->toggleStatus())
Tools::redirectAdmin(self::$currentIndex.'&conf=5'.((($id_category = (!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1')) && Tools::getValue('id_product')) ? '&id_category='.$id_category : '').'&token='.$token); Tools::redirectAdmin(self::$currentIndex.'&conf=5'.((($id_category = (!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1')) && Tools::getValue('id_product')) ? '&id_category='.$id_category : '').'&token='.($token ? $token : $this->token));
else else
$this->_errors[] = Tools::displayError('An error occurred while updating status.'); $this->_errors[] = Tools::displayError('An error occurred while updating status.');
} }
@@ -1091,7 +1092,7 @@ if (false)
{ {
$className = 'Product'; $className = 'Product';
$rules = call_user_func(array($this->className, 'getValidationRules'), $this->className); $rules = call_user_func(array($this->className, 'getValidationRules'), $this->className);
$defaultLanguage = $this->context->language; $defaultLanguage = new Language((int)(Configuration::get('PS_LANG_DEFAULT')));
$languages = Language::getLanguages(false); $languages = Language::getLanguages(false);
/* Check required fields */ /* Check required fields */
@@ -1271,7 +1272,7 @@ if (false)
} }
if (Tools::getValue('resizer') == 'man' && isset($id_image) && is_int($id_image) && $id_image) if (Tools::getValue('resizer') == 'man' && isset($id_image) && is_int($id_image) && $id_image)
Tools::redirectAdmin(self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&id_image='.$id_image.'&imageresize&toconf=3&submitAddAndStay='.(Tools::isSubmit('submitAdd'.$this->table.'AndStay') ? 'on' : 'off').'&token='.(($token ? $token : $this->token))); Tools::redirectAdmin(self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&id_image='.$id_image.'&imageresize&toconf=3&submitAddAndStay='.(Tools::isSubmit('submitAdd'.$this->table.'AndStay') ? 'on' : 'off').'&token='.($token ? $token : $this->token));
// Save and stay on same form // Save and stay on same form
if (Tools::isSubmit('submitAdd'.$this->table.'AndStay')) if (Tools::isSubmit('submitAdd'.$this->table.'AndStay'))
Tools::redirectAdmin(self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&addproduct&conf=3&tabs='.(int)(Tools::getValue('tabs')).'&token='.($token ? $token : $this->token)); Tools::redirectAdmin(self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&addproduct&conf=3&tabs='.(int)(Tools::getValue('tabs')).'&token='.($token ? $token : $this->token));
js/admin.js
+1 -1
View File
@@ -930,7 +930,7 @@ function showErrorMessage(msg)
} }
$(document).ready(function(){ $(document).ready(function(){
$(".copy2friendlyURL").live('keyup',function(e){ $(".copy2friendlyUrl").live('keyup',function(e){
if(!isArrowKey(e)) if(!isArrowKey(e))
return copy2friendlyURL() return copy2friendlyURL()
}); });