Fix task page bugs

Author: GilbertCherrie

app/controllers/miq_task_controller.rb

@@ -128,7 +128,11 @@ def cancel_task
   # Delete selected tasks
   def delete_tasks
     assert_privileges("miq_task_delete")
-    delete_tasks_from_table(find_checked_items, "Delete selected tasks")
+
+    checked_items = find_checked_items
+    new_checked_items = find_checked_items.select { |item| params["select-row-#{item}"] == "on" }
+
+    delete_tasks_from_table(new_checked_items, "Delete selected tasks")
     jobs
     @refresh_partial = "layouts/tasks"
   end
@@ -329,6 +333,12 @@ def build_query_for_state(opts)
   def tasks_scopes(opts, use_times = true)
     scope = []
 
+    # Add time scope
+    if use_times
+      t = format_timezone(opts[:time_period].to_i != 0 ? opts[:time_period].days.ago : Time.now, Time.zone, "raw")
+      scope << [:with_updated_on_between, t.beginning_of_day, t.end_of_day]
+    end
+
     # Specify user scope
     if @tabform == "tasks_1"
       scope << [:with_userid, session[:userid]]
@@ -347,12 +357,6 @@ def tasks_scopes(opts, use_times = true)
       scope << :no_status_selected
     end
 
-    # Add time scope
-    if use_times
-      t = format_timezone(opts[:time_period].to_i != 0 ? opts[:time_period].days.ago : Time.now, Time.zone, "raw")
-      scope << [:with_updated_on_between, t.beginning_of_day, t.end_of_day]
-    end
-
     # Add zone scope
     scope << [:with_zone, opts[:zone]] if opts[:zone] && opts[:zone] != "<all>"
 

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

@@ -4,7 +4,6 @@ import PropTypes from 'prop-types';
 import { FormSpy } from '@data-driven-forms/react-form-renderer';
 import createSchema from './settings-tasks-form.schema';
 import loadTable from './load-table-helper';
-import GtlView from '../gtl-view';
 
 const SettingsTasksForm = ({
   allTasks, zones, users, timePeriods, taskStates, tz,
@@ -47,7 +46,6 @@ const SettingsTasksForm = ({
           loadDefaultTable();
         }}
       />
-      <GtlView showUrl="/miq_task/show" />
     </div>
   );
 };

app/views/layouts/_tasks.html.haml

@@ -1,2 +1,3 @@
 #main_div
   = render :partial => 'miq_task/tasks_options'
+  = render :partial => 'layouts/gtl'