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

studio ui fix

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2018-03-27 16:38:10 +02:00
parent 09f25ef4ef
commit 849ab4f4b0
5 changed files with 52 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sites/all/modules/figli/edlp_studio/assets/js/edlp_studio.js
+5 -2
View File
@@ -123,8 +123,11 @@
console.log('onActionToCompoDone',data);
$('.composition-link').removeClass('is-active');
$link.removeClass('ajax-loading').addClass('is-active');
$('.composition', $composer).replaceWith(data.compo);
if($('.composition', $composer).length){
$('.composition', $composer).replaceWith(data.compo);
}else{
$('header', $composer).after(data.compo);
}
$composer.removeClass('ajax-loading');
initDragAndDropUI();
$('body').trigger({
sites/all/modules/figli/edlp_studio/includes/edlp_composition_ui.inc
+6 -3
View File
@@ -3,9 +3,12 @@
function template_preprocess_edlp_composition_ui(&$vars){
// dpm($vars);
$view_builder = \Drupal::entityTypeManager()->getViewBuilder('composition');
$vars['composition'] = $view_builder->view($vars['lastcomposition'], 'studio_ui');
if($vars['lastcomposition']){
$view_builder = \Drupal::entityTypeManager()->getViewBuilder('composition');
$vars['composition'] = $view_builder->view($vars['lastcomposition'], 'studio_ui');
}else{
$vars['composition'] = null;
}
}
sites/all/modules/figli/edlp_studio/src/Controller/StudioUIController.php
+11 -2
View File
@@ -135,7 +135,12 @@ class StudioUIController extends ControllerBase {
->condition('user_id', $this->user->id());
$compos_ids = $query->execute();
$compos = entity_load_multiple('composition', $compos_ids);
// dpm($compos_ids);
if(count($compos_ids)){
$compos = entity_load_multiple('composition', $compos_ids);
}else{
$compos = array();
}
$createurl = Url::fromRoute('edlp_studio.composition_controller_action_ajax', ['action' => 'create'], ['absolute' => TRUE]);
@@ -154,7 +159,11 @@ class StudioUIController extends ControllerBase {
->sort('created');
$compos_id = $query->execute();
$lastcompo = entity_load('composition', array_pop($compos_id));
if(count($compos_id)){
$lastcompo = entity_load('composition', array_pop($compos_id));
}else{
$lastcompo = null;
}
return $lastcompo;
}