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

// fix bug tag image in AdminProductsController

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11206 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2011-12-14 14:37:28 +00:00
parent 12386a5b57
commit 91c95d7146
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/products/informations.tpl
+11 -10
View File
@@ -484,20 +484,20 @@ var textFieldLabel = 0;
<script type="text/javascript">
$(function() {
changeTagImage();
$("#createImageDescription input").change(function(){
$('#createImageDescription input').change(function(){
changeTagImage();
});
var i = 0;
$(".addImageDescription").click(function(){
$('.addImageDescription').click(function(){
if (i == 0){
$("#createImageDescription").animate({
opacity: 1, height: "toggle"
$('#createImageDescription').animate({
opacity: 1, height: 'toggle'
}, 500);
i = 1;
}else{
$("#createImageDescription").animate({
opacity: 0, height: "toggle"
$('#createImageDescription').animate({
opacity: 0, height: 'toggle'
}, 500);
i = 0;
}
@@ -505,10 +505,11 @@ var textFieldLabel = 0;
});
function changeTagImage(){
var smallImage = $("input[name=smallImage]:checked").attr("value");
var leftRight = $("input[name=leftRight]:checked").attr("value");
var imageTypes = $("input[name=imageTypes]:checked").attr("value");
$("#resultImage").val("{img-"+smallImage+"-"+leftRight+"-"+imageTypes+"}");
var smallImage = $('input[name=smallImage]:checked').attr('value');
var leftRight = $('input[name=leftRight]:checked').attr('value');
var imageTypes = $('input[name=imageTypes]:checked').attr('value');
var tag = '[img-'+smallImage+'-'+leftRight+'-'+imageTypes+']';
$('#resultImage').val(tag);
}
</script>
{/if}
controllers/front/ProductController.php
+1 -1
View File
@@ -440,7 +440,7 @@ class ProductControllerCore extends FrontController
public function transformDescriptionWithImg($desc)
{
$reg = '/{img-([0-9]+)-(left|right)-([a-z]+)}/';
$reg = '/\[img-([0-9]+)-(left|right)-([a-z]+)\]/';
while (preg_match($reg, $desc, $matches))
{
$link_lmg = $this->context->link->getImageLink($this->product->link_rewrite, $this->product->id.'-'.$matches[1], $matches[3]);