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

delete composition ajax link is working !

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2018-03-24 11:40:51 +01:00
parent 6cc38d3300
commit eed0b50970
7 changed files with 268 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sites/all/modules/figli/edlp_studio/assets/js/edlp_studio.js
+62
View File
@@ -77,11 +77,36 @@
function initAjaxCompoLinks(){
console.log('studio initAjaxCompoLinks');
$('.new-composition-link:not(.ajax-enabled)')
.addClass('ajax-enabled')
.on('click', onClickNewCompoLink);
$('.composition-link:not(.ajax-enabled)')
.addClass('ajax-enabled')
.on('click', onClickCompoLink);
$('.delete-composition-link:not(.ajax-enabled)')
.addClass('ajax-enabled')
.on('click', onClickDeleteCompoLink);
};
// ___ ___
// / _ \ _ __ ___ _ _ / __|___ _ __ _ __ ___
// | (_) | '_ \/ -_) ' \ | (__/ _ \ ' \| '_ \/ _ \
// \___/| .__/\___|_||_| \___\___/_|_|_| .__/\___/
// |_| |_|
function onClickCompoLink(e){
e.preventDefault();
console.log('onClickCompoLink');
return false;
};
// _ _ _____ __ __ __ ___ _ __ _ __ ___
// | ' \/ -_) V V / / _/ _ \ ' \| '_ \/ _ \
// |_||_\___|\_/\_/ \__\___/_|_|_| .__/\___/
// |_|
function onClickNewCompoLink(e){
e.preventDefault();
setInputForNewCompoName($(this));
return false;
@@ -141,6 +166,43 @@
};
// ___ _ _
// | \ ___| |___| |_ ___ __ ___ _ __ _ __ ___
// | |) / -_) / -_) _/ -_) / _/ _ \ ' \| '_ \/ _ \
// |___/\___|_\___|\__\___| \__\___/_|_|_| .__/\___/
// |_|
function onClickDeleteCompoLink(e){
e.preventDefault();
// TODO: confirm
deleteCompo($(this));
return false;
};
function deleteCompo($link){
var ajax_path = $link.attr('data-drupal-link-system-path');
var path = window.location.origin + Drupal.url(ajax_path);
$link.parents('li').addClass('ajax-loading');
$.getJSON(path, {})
.done(function(data){
onDeleteCompoDone(data, $link);
})
.fail(function(jqxhr, textStatus, error){
onErrorDeleteCompo(jqxhr, textStatus, error, $link);
});
};
function onDeleteCompoDone(data, $link, $form){
console.log('onDeleteCompoDone',data);
if(data.status == "ok"){
$link.parents('li').remove();
}else{
console.warn(data.message);
}
};
function onErrorDeleteCompo(jqxhr, textStatus, error, $link){
$link.parents('li').removeClass('ajax-loading');
console.warn('delete compo load failed : '+error, jqxhr.responseText);
};
// ___ _ _ _ _
// / __| |_ _ _ __| (_)___ ___ _ _(_)
// \__ \ _| || / _` | / _ \___| || | |
sites/all/modules/figli/edlp_studio/includes/edlp_compositions_list.inc
+31 -10
View File
@@ -11,20 +11,41 @@ function template_preprocess_edlp_compositions_list(&$vars){
);
foreach($vars['composition_entities'] as $entity){
// get the url
$url = Url::fromRoute('entity.composition.canonical', ['composition' => $entity->id()], ['absolute' => TRUE]);
$url = Url::fromRoute('entity.composition.canonical',
['composition' => $entity->id()], ['absolute' => TRUE]);
// get the delete url
$delete_url = Url::fromRoute('edlp_studio.composition_controller_action_ajax',
['action' => 'delete', 'cid'=>$entity->id()], ['absolute' => TRUE]);
$title = $entity->getName();
$vars['compositions']['#items'][] = array(
'#title' => $title,
'#type' => 'link',
'#url' => $url,
'#options'=>array(
'attributes' => array(
'data-drupal-link-system-path' => $url->getInternalPath(),
'nid' => $entity->id(),
'class' => ['composition-link'],
'title'=>$title,
'compo_link' => array(
'#title' => $title,
'#type' => 'link',
'#url' => $url,
'#options'=>array(
'attributes' => array(
'data-drupal-link-system-path' => $url->getInternalPath(),
'nid' => $entity->id(),
'class' => ['composition-link'],
'title'=>$title,
),
),
),
'delete_link' => array(
'#title' => "delete",
'#type' => 'link',
'#url' => $delete_url,
'#options'=>array(
'attributes' => array(
'data-drupal-link-system-path' => $delete_url->getInternalPath(),
'nid' => $entity->id(),
'class' => ['delete-composition-link'],
'title'=> t('Delete @title', array('@title'=>$title)),
),
),
)
);
}
sites/all/modules/figli/edlp_studio/src/Controller/CompositionController.php
+42 -27
View File
@@ -61,9 +61,13 @@ class CompositionController extends ControllerBase {
$this->error_message = t("Composition creation needs a name as query paramater!");
}
break;
// case 'delete':
//
// break;
case 'delete':
if($cid){
$this->deleteComposition($cid);
}else{
$this->error_message = t("Composition deletion needs a cid as url paramater!");
}
break;
// case 'rename':
//
// break;
@@ -71,39 +75,46 @@ class CompositionController extends ControllerBase {
if($this->error_message){
$status = 'error';
}
if($status == 'error'){
$message = $this->error_message;
}else{
$url = Url::fromRoute('entity.composition.canonical', ['composition' => $this->compo->id()], ['absolute' => TRUE]);
$title = $this->compo->getName();
$new_link_build = array(
'#title' => $title,
'#type' => 'link',
'#url' => $url,
'#options'=>array(
'attributes' => array(
'data-drupal-link-system-path' => $url->getInternalPath(),
'nid' => $this->compo->id(),
'class' => ['composition-link'],
'title'=>$title,
),
),
);
$new_link = render($new_link_build);
}
// JSON
$response = new JsonResponse();
$data = array(
'action' => $action,
'status' => $status,
'message' => $this->error_message,
'new_name' => $request->query->get('new_name'),
'new_link' => $new_link,
'message' => $this->error_message
);
if($status == 'ok'){
switch ($action) {
case 'create':
$url = Url::fromRoute('entity.composition.canonical', ['composition' => $this->compo->id()], ['absolute' => TRUE]);
$title = $this->compo->getName();
$new_link_build = array(
'#title' => $title,
'#type' => 'link',
'#url' => $url,
'#options'=>array(
'attributes' => array(
'data-drupal-link-system-path' => $url->getInternalPath(),
'nid' => $this->compo->id(),
'class' => ['composition-link'],
'title'=>$title,
),
),
);
$data += array(
'new_name' => $title,
'new_link' => render($new_link_build),
);
break;
// case 'delete':
// # code...
// break;
}
}
$response->setData($data);
return $response;
@@ -124,4 +135,8 @@ class CompositionController extends ControllerBase {
$this->compo->save();
}
private function deleteComposition($cid){
$this->compo = entity_load('composition', $cid);
$this->compo->delete();
}
}