bachir/edlp_d8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

studio composition : fixed empty field documents bug

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2018-03-27 09:17:53 +02:00
parent 4e33e4c8af
commit 4cfdf1a491
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sites/all/modules/figli/edlp_studio/assets/js/edlp_studio.js
+12 -5
View File
@@ -116,7 +116,7 @@
$('.composition-link').removeClass('is-active'); $('.composition-link').removeClass('is-active');
$link.removeClass('ajax-loading').addClass('is-active'); $link.removeClass('ajax-loading').addClass('is-active');
$composer.html(data.compo); $('.composition', $composer).replaceWith(data.compo);
$composer.removeClass('ajax-loading'); $composer.removeClass('ajax-loading');
initDragAndDropUI(); initDragAndDropUI();
}; };
@@ -260,11 +260,18 @@
// |___/|_| \__,_\__, | \_____| |___/|_| \___/ .__/ \___/|___| // |___/|_| \__,_\__, | \_____| |___/|_| \___/ .__/ \___/|___|
// |___/ |_| // |___/ |_|
function initDragAndDropUI(){ function initDragAndDropUI(){
// check if field--name-documents exists
// add real dom square element to handle sorting if (!$('.composition_ui .composer .composition .field--name-documents').length) {
$('.composition_ui .composer .composition .field--name-documents .field__item').each(function(i){ // if not create it
$field_documents = $('<div>')
.addClass('field').addClass('field--name-documents')
.appendTo('.composition_ui .composer .composition');
}else{
// add real dom square element to handle sorting
$field_documents = $('.composition_ui .composer .composition .field--name-documents'); $('.field__item', $field_documents).each(function(i){
$(this).prepend($('<span>').addClass('handler')); $(this).prepend($('<span>').addClass('handler'));
}); });
}
// create remove dropzone // create remove dropzone
var $remove_zone = $('<div>').addClass('remove-drop-zone') var $remove_zone = $('<div>').addClass('remove-drop-zone')
@@ -288,7 +295,7 @@
}); });
// create sortable // create sortable
$('.composition_ui .composer .composition .field--name-documents').sortable({ $field_documents.sortable({
revert:false, revert:false,
handle: ".handler", handle: ".handler",
receive:function(e, ui){ receive:function(e, ui){
sites/all/modules/figli/edlp_studio/src/Controller/CompositionController.php
+1 -1
View File
@@ -159,7 +159,7 @@ class CompositionController extends ControllerBase {
private function getRendredComposition(){ private function getRendredComposition(){
$view_builder = \Drupal::entityTypeManager()->getViewBuilder('composition'); $view_builder = \Drupal::entityTypeManager()->getViewBuilder('composition');
$compobuild = $view_builder->view($this->compo, 'default'); $compobuild = $view_builder->view($this->compo, 'studio_ui');
$this->rendered_compo = render($compobuild); $this->rendered_compo = render($compobuild);
} }