gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

TW-1666: import should reject invalid data

Browse Source 
- Thanks to Daniel Shahaf.
This commit is contained in:
Paul Beckingham
2015-08-22 12:34:10 -04:00
parent d640fed3d4
commit bc1aa0bc0f
11 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -125,6 +125,7 @@
David Patrick).
- TW-1655 Inform "No changes made." when quitting early due to signal (thanks
to Daniel Shahaf).
- TW-1666 import should reject invalid data (thanks to Daniel Shahaf).
- Prevent potential task duplication during import for non-pending tasks.
- Show the active context in "context list", if any is active.
- Fix "task edit" dropping annotation text after newlines.

6
src/Task.cpp
View File

@@ -178,7 +178,7 @@ Task::status Task::textToStatus (const std::string& input)
else if (input[0] == 'r') return Task::recurring;
else if (input[0] == 'w') return Task::waiting;
return Task::pending;
throw format (STRING_ERROR_BAD_STATUS, input);
}
////////////////////////////////////////////////////////////////////////////////
@@ -1401,7 +1401,9 @@ void Task::substitute (
//
void Task::validate (bool applyDefault /* = true */)
{
Task::status status = getStatus ();
Task::status status = Task::pending;
if (get ("status") != "")
status = getStatus ();
// 1) Provide missing attributes where possible
// Provide a UUID if necessary. Validate if present.

1
src/l10n/deu-DEU.h
View File

@@ -753,6 +753,7 @@
#define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command."
#define STRING_ERROR_NO_MODS "Command line modifications are not supported by this command."
#define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made."
#define STRING_ERROR_BAD_STATUS "The status '{1}' is not valid."
// Feedback
#define STRING_FEEDBACK_NO_TASKS "Keine Aufgaben."

1
src/l10n/eng-USA.h
View File

@@ -751,6 +751,7 @@
#define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command."
#define STRING_ERROR_NO_MODS "Command line modifications are not supported by this command."
#define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made."
#define STRING_ERROR_BAD_STATUS "The status '{1}' is not valid."
// Feedback
#define STRING_FEEDBACK_NO_TASKS "No tasks."

1
src/l10n/epo-RUS.h
View File

@@ -753,6 +753,7 @@
#define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command."
#define STRING_ERROR_NO_MODS "Command line modifications are not supported by this command."
#define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made."
#define STRING_ERROR_BAD_STATUS "The status '{1}' is not valid."
// Feedback
#define STRING_FEEDBACK_NO_TASKS "Nenia tasko."

1
src/l10n/esp-ESP.h
View File

@@ -765,6 +765,7 @@
#define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command."
#define STRING_ERROR_NO_MODS "Command line modifications are not supported by this command."
#define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made."
#define STRING_ERROR_BAD_STATUS "The status '{1}' is not valid."
// Feedback
#define STRING_FEEDBACK_NO_TASKS "Ninguna tarea."

1
src/l10n/fra-FRA.h
View File

@@ -753,6 +753,7 @@
#define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command."
#define STRING_ERROR_NO_MODS "Command line modifications are not supported by this command."
#define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made."
#define STRING_ERROR_BAD_STATUS "The status '{1}' is not valid."
// Feedback
#define STRING_FEEDBACK_NO_TASKS "No tasks."

1
src/l10n/ita-ITA.h
View File

@@ -752,6 +752,7 @@
#define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command."
#define STRING_ERROR_NO_MODS "Command line modifications are not supported by this command."
#define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made."
#define STRING_ERROR_BAD_STATUS "The status '{1}' is not valid."
// Feedback
#define STRING_FEEDBACK_NO_TASKS "Nessun task."

1
src/l10n/jpn-JPN.h
View File

@@ -753,6 +753,7 @@
#define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command."
#define STRING_ERROR_NO_MODS "Command line modifications are not supported by this command."
#define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made."
#define STRING_ERROR_BAD_STATUS "The status '{1}' is not valid."
// Feedback
#define STRING_FEEDBACK_NO_TASKS "タスクがない。"

1
src/l10n/pol-POL.h
View File

@@ -753,6 +753,7 @@
#define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command."
#define STRING_ERROR_NO_MODS "Command line modifications are not supported by this command."
#define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made."
#define STRING_ERROR_BAD_STATUS "The status '{1}' is not valid."
// Feedback
#define STRING_FEEDBACK_NO_TASKS "Brak zadań."

1
src/l10n/por-PRT.h
View File

@@ -753,6 +753,7 @@
#define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command."
#define STRING_ERROR_NO_MODS "Command line modifications are not supported by this command."
#define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made."
#define STRING_ERROR_BAD_STATUS "The status '{1}' is not valid."
// Feedback
#define STRING_FEEDBACK_NO_TASKS "Nenhuma tarefa."