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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source 
Conflicts:
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
This commit is contained in:
Kevin Granger committed 2013-09-30 11:01:23 +02:00
2 parents f84a3c7fda 3e85622972
commit 8ed77030aa
84 files changed
+741 -17517
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

js/admin.js
+2 -1
View File
@@ -481,7 +481,7 @@ function askFeatureName(selected, selector)
{
var elem;
if (selected.value == 'feature')
if (selected.value == 'features')
{
$('#features_' + selector).show();
$('#feature_name_' + selector).attr('name', selected.name);
@@ -776,6 +776,7 @@ function doAdminAjax(data, success_func, error_func)
{
url : 'index.php',
data : data,
type : 'POST',
success : function(data){
if (success_func)
return success_func(data);