TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cleanmaster' into modules

Browse Source
This commit is contained in:
Etienne Roudeix
2013-12-16 11:32:54 +01:00
parent c5e69ebbb9 86f1e06e42
commit 977bbb55fa
5 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Thelia/Model/CategoryDocument.php
View File

@@ -50,4 +50,14 @@ class CategoryDocument extends BaseCategoryDocument
{
return $this->getCategoryId();
}
public function preDelete(ConnectionInterface $con = null)
{
$this->reorderBeforeDelete(
array(
"category_id" => $this->getCategoryId(),
)
);
return true;
}
}

10
core/lib/Thelia/Model/ContentDocument.php
View File

@@ -50,4 +50,14 @@ class ContentDocument extends BaseContentDocument
{
return $this->getContentId();
}
public function preDelete(ConnectionInterface $con = null)
{
$this->reorderBeforeDelete(
array(
"content_id" => $this->getContentId(),
)
);
return true;
}
}

10
core/lib/Thelia/Model/FolderDocument.php
View File

@@ -50,4 +50,14 @@ class FolderDocument extends BaseFolderDocument
{
return $this->getFolderId();
}
public function preDelete(ConnectionInterface $con = null)
{
$this->reorderBeforeDelete(
array(
"folder_id" => $this->getFolderId(),
)
);
return true;
}
}

10
core/lib/Thelia/Model/ProductDocument.php
View File

@@ -51,4 +51,14 @@ class ProductDocument extends BaseProductDocument
return $this->getProductId();
}
public function preDelete(ConnectionInterface $con = null)
{
$this->reorderBeforeDelete(
array(
"product_id" => $this->getProductId(),
)
);
return true;
}
}

9
templates/backOffice/default/assets/js/document-upload.js
View File

@@ -40,7 +40,6 @@ $(function($){
documentDropzone.removeFile(file);
$.documentUploadManager.updateDocumentListAjax();
$.documentUploadManager.onClickDeleteDocument();
$.documentUploadManager.sortDocument();
});
@@ -66,6 +65,7 @@ $(function($){
data
);
$.documentUploadManager.onClickDeleteDocument();
$.documentUploadManager.sortDocument();
});
};
@@ -90,11 +90,16 @@ $(function($){
}
}
}).done(function(data) {
$parent.parents('tr').remove();
$parent.parents('li').remove();
$(".document-manager .message").html(
data
);
/* refresh position */
$( "#js-sort-document").children('li').each(function(position, element) {
$(element).find('.js-sorted-position').html(position + 1);
});
});
return false;
});