Skip to content

Commit ab2ae8c

Browse files
authored
Merge pull request #9479 from GilbertCherrie/fix_task_page_bugs
Fix task page bugs
2 parents 66865b8 + f3a1f00 commit ab2ae8c

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

app/controllers/miq_task_controller.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,10 @@ def cancel_task
128128
# Delete selected tasks
129129
def delete_tasks
130130
assert_privileges("miq_task_delete")
131-
delete_tasks_from_table(find_checked_items, "Delete selected tasks")
131+
132+
new_checked_items = find_checked_items.select { |item| params["select-row-#{item}"] == "on" }
133+
134+
delete_tasks_from_table(new_checked_items, "Delete selected tasks")
132135
jobs
133136
@refresh_partial = "layouts/tasks"
134137
end

app/javascript/components/settings-tasks-form/index.jsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import PropTypes from 'prop-types';
44
import { FormSpy } from '@data-driven-forms/react-form-renderer';
55
import createSchema from './settings-tasks-form.schema';
66
import loadTable from './load-table-helper';
7-
import GtlView from '../gtl-view';
87

98
const SettingsTasksForm = ({
109
allTasks, zones, users, timePeriods, taskStates, tz,
@@ -47,7 +46,6 @@ const SettingsTasksForm = ({
4746
loadDefaultTable();
4847
}}
4948
/>
50-
<GtlView showUrl="/miq_task/show" />
5149
</div>
5250
);
5351
};

app/views/layouts/_tasks.html.haml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
#main_div
22
= render :partial => 'miq_task/tasks_options'
3+
= render :partial => 'layouts/gtl'

0 commit comments

Comments
 (0)