diff --git a/checkin_notes b/checkin_notes index 32820a0351..3af875b2f2 100755 --- a/checkin_notes +++ b/checkin_notes @@ -8560,3 +8560,11 @@ David 26 June 2005 sched/ handle_request.C + +David 26 June 2005 + - trigger transitioner when cancel WU, to set file delete + + client/ + file_names.C + html/ops + cancel_wu_action.php diff --git a/client/file_names.C b/client/file_names.C index 7bad83a22d..55ce96fa11 100644 --- a/client/file_names.C +++ b/client/file_names.C @@ -141,7 +141,7 @@ void get_account_filename(char* master_url, char* path) { } static bool bad_account_filename(const char* filename) { - msg_printf(NULL, MSG_ERROR, "Invalid account file: %s", filename); + msg_printf(NULL, MSG_ERROR, "Invalid account filename: %s", filename); return false; } diff --git a/html/ops/cancel_wu_action.php b/html/ops/cancel_wu_action.php index f13dfd2570..a37cd40d41 100644 --- a/html/ops/cancel_wu_action.php +++ b/html/ops/cancel_wu_action.php @@ -26,6 +26,12 @@ function cancel_wu($wuid1, $wuid2) { return 2; } + // trigger the transitioner (it will set file_delete_state) + + $now = time(); + $query = ="update workunit set transition_time=$now where $wuid1<=id and id<=$wuid2"; + mysql_query($query); + return 0; }