L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-64777_delete-static' of https://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2019-04-16 10:59:55 +02:00
parent a251ed8be7 6fce5a13cc
commit 7f7b751ea2
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/analytics/classes/output/models_list.php
+8 -10
View File
@@ -326,16 +326,14 @@ class models_list implements \renderable, \templatable {
}
// Delete model.
if (!$model->is_static()) {
$actionid = 'delete-' . $model->get_id();
$PAGE->requires->js_call_amd('tool_analytics/model', 'confirmAction', [$actionid, 'delete']);
$urlparams['action'] = 'delete';
$url = new \moodle_url('model.php', $urlparams);
$icon = new \action_menu_link_secondary($url, new \pix_icon('t/delete',
get_string('delete', 'tool_analytics')), get_string('delete', 'tool_analytics'),
['data-action-id' => $actionid]);
$actionsmenu->add($icon);
}
$actionid = 'delete-' . $model->get_id();
$PAGE->requires->js_call_amd('tool_analytics/model', 'confirmAction', [$actionid, 'delete']);
$urlparams['action'] = 'delete';
$url = new \moodle_url('model.php', $urlparams);
$icon = new \action_menu_link_secondary($url, new \pix_icon('t/delete',
get_string('delete', 'tool_analytics')), get_string('delete', 'tool_analytics'),
['data-action-id' => $actionid]);
$actionsmenu->add($icon);
$modeldata->actions = $actionsmenu->export_for_template($output);
admin/tool/analytics/model.php
+1 -3
View File
@@ -103,9 +103,7 @@ switch ($action) {
case 'delete':
confirm_sesskey();
if (!$model->is_static()) {
$model->delete();
}
$model->delete();
redirect($returnurl);
break;