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/carrier_wizard/helpers/form/form_ranges.tpl
	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/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
This commit is contained in:
Kevin Granger
2013-10-14 12:21:29 +02:00
parent 59435fa2ee f9cfde9a05
commit 67dc7aac04
316 changed files with 8504 additions and 1178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/admin.js
-26
View File
@@ -477,32 +477,6 @@ function validateImportation(mandatory)
}
}
function askFeatureName(selected, selector)
{
var elem;
if (selected.value == 'features')
{
$('#features_' + selector).show();
$('#feature_name_' + selector).attr('name', selected.name);
}
}
function replaceFeature(toReplace, selector)
{
var elem;
if ($('#feature_name_' + selector).val() == '')
return false;
elem = getE(toReplace);
elem.options[elem.selectedIndex].text = $('#feature_name_' + selector).val();
elem.options[elem.selectedIndex].value = '#F_' + $('#feature_name_' + selector).val();
$('#features_' + selector).toggle();
$('#feature_name_' + selector).val('');
$('#feature_name_' + selector).attr('name', '');
}
function chooseTypeTranslation(id_lang)
{
getE('translation_lang').value = id_lang;