Merge pull request #1574 from timopollmeier/alterable-clone-20.08

Backport "alterable" fix for cloned tasks to 20.08
greenbone · Jun 22, 2021 · b23d7bb · b23d7bb
2 parents 2187224 + de03dea
commit b23d7bb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Free alert get data in report_content_for_alert [#1526](https://github.com/greenbone/gvmd/pull/1526) 
 - Fix erroneous freeing of ical timezone component [#1530](https://github.com/greenbone/gvmd/pull/1530)
 - Fixed the sorting / filter by username functionality for remediation tickets [#1546](https://github.com/greenbone/gvmd/pull/1546)
+- The alterable indicator is now copied when cloning a task [#1553](https://github.com/greenbone/gvmd/pull/1553)
 - Fix stop resume feature. [#1568](https://github.com/greenbone/gvmd/pull/1568)
 
 ### Removed

diff --git a/src/gmp.c b/src/gmp.c
@@ -21962,17 +21962,22 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
               int ret;
               gchar *name, *comment;
               task_t new_task;
+              int alterable;
 
               name = task_name (create_task_data->task);
               comment = task_comment (create_task_data->task);
+
+              if(create_task_data->alterable)
+                alterable = strcmp (create_task_data->alterable, "0") ? 1 : 0;
+              else
+                alterable = -1;
+
               ret = copy_task (name,
                                comment,
                                create_task_data->copy,
-                               (create_task_data->alterable
-                                && strcmp (create_task_data->alterable, "0"))
-                                ? 1
-                                : 0,
+                               alterable,
                                &new_task);
+
               g_free (name);
               g_free (comment);
               /* Remove the task that was created while parsing elements. */

diff --git a/src/manage_sql.c b/src/manage_sql.c
@@ -29709,7 +29709,8 @@ set_task_comment (task_t task, const char *comment)
  * @param[in]  name        Name of new task.  NULL to copy from existing.
  * @param[in]  comment     Comment on new task.  NULL to copy from existing.
  * @param[in]  task_id     UUID of existing task.
- * @param[in]  alterable   Whether the new task will be alterable.
+ * @param[in]  alterable   Whether the new task will be alterable. < 0 to
+ *                         to copy from existing.
  * @param[out] new_task    New task.
  *
  * @return 0 success, 2 failed to find existing task, 99 permission denied,
@@ -29735,17 +29736,21 @@ copy_task (const char* name, const char* comment, const char *task_id,
                             " scanner, schedule_next_time,"
                             " config_location, target_location,"
                             " schedule_location, scanner_location,"
-                            " hosts_ordering, usage_type",
+                            " hosts_ordering, usage_type, alterable",
                             1, &new, &old);
   if (ret)
     {
       sql_rollback ();
       return ret;
     }
 
-  sql ("UPDATE tasks SET alterable = %i, hidden = 0 WHERE id = %llu;",
-       alterable,
-       new);
+  if (alterable >= 0)
+    sql ("UPDATE tasks SET alterable = %i, hidden = 0 WHERE id = %llu;",
+         alterable,
+         new);
+  else
+    sql ("UPDATE tasks SET hidden = 0 WHERE id = %llu;",
+         new);
 
   set_task_run_status (new, TASK_STATUS_NEW);
   sql ("INSERT INTO task_preferences (task, name, value)"