From 0a09afdcac3e9d1dbd15d89e5cd5127a01f3b273 Mon Sep 17 00:00:00 2001 From: Craig Crosby Date: Thu, 24 Jan 2019 11:42:05 -0500 Subject: [PATCH 1/5] Update AutoCreateSubtask.php --- Action/AutoCreateSubtask.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Action/AutoCreateSubtask.php b/Action/AutoCreateSubtask.php index 6e6380b..d68747f 100644 --- a/Action/AutoCreateSubtask.php +++ b/Action/AutoCreateSubtask.php @@ -32,6 +32,7 @@ public function getActionRequiredParameters() 'time_estimated' => t('Estimated Time in Hours'), 'duration' => t('Duration in days'), 'check_box' => t('Apply to all Columns'), + 'duplicate' => t('Do not duplicate subtasks'), ); } @@ -63,11 +64,20 @@ public function doAction(array $data) 'due_date' => strtotime('+'.$this->getParam('duration').'days'), ); - $subtasks = explode("\r\n", isset($values['title']) ? $values['title'] : ''); + $subtasks = array_map('trim', explode("\r\n", isset($values['title']) ? $values['title'] : '')); $subtasksAdded = 0; + + if ($this->getParam('duplicate') == true ){ + $current_subtasks = $this->subtaskModel->getAll($data['task_id']); + foreach ($current_subtasks as $current_subtask) { + if (in_array($current_subtask['title'], $subtasks)) { + $title = array_search($current_subtask['title'], $subtasks); + unset($subtasks[$title]); + } + } + } foreach ($subtasks as $subtask) { - $subtask = trim($subtask); if (! empty($subtask)) { $subtaskValues = $values; From cee07d140a19a5ed88d86a7e07a59706dc6ee1f3 Mon Sep 17 00:00:00 2001 From: Craig Crosby Date: Thu, 24 Jan 2019 11:43:47 -0500 Subject: [PATCH 2/5] Update AutoCreateSubtaskVanilla.php --- Action/AutoCreateSubtaskVanilla.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Action/AutoCreateSubtaskVanilla.php b/Action/AutoCreateSubtaskVanilla.php index 6f6e384..5726aab 100644 --- a/Action/AutoCreateSubtaskVanilla.php +++ b/Action/AutoCreateSubtaskVanilla.php @@ -31,6 +31,7 @@ public function getActionRequiredParameters() 'multitasktitles' => t('Subtask Title(s)'), 'time_estimated' => t('Estimated Time in Hours'), 'check_box' => t('Apply to all Columns'), + 'duplicate' => t('Do not duplicate subtasks'), ); } @@ -61,11 +62,20 @@ public function doAction(array $data) 'status' => 0, ); - $subtasks = explode("\r\n", isset($values['title']) ? $values['title'] : ''); + $subtasks = array_map('trim', explode("\r\n", isset($values['title']) ? $values['title'] : '')); $subtasksAdded = 0; + + if ($this->getParam('duplicate') == true ){ + $current_subtasks = $this->subtaskModel->getAll($data['task_id']); + foreach ($current_subtasks as $current_subtask) { + if (in_array($current_subtask['title'], $subtasks)) { + $title = array_search($current_subtask['title'], $subtasks); + unset($subtasks[$title]); + } + } + } foreach ($subtasks as $subtask) { - $subtask = trim($subtask); if (! empty($subtask)) { $subtaskValues = $values; From 30ad4ca715fa2139accc11c6d44ed23d77420686 Mon Sep 17 00:00:00 2001 From: Craig Crosby Date: Thu, 24 Jan 2019 11:48:20 -0500 Subject: [PATCH 3/5] Update AutoCreateSubtask.php --- Action/AutoCreateSubtask.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Action/AutoCreateSubtask.php b/Action/AutoCreateSubtask.php index d68747f..fec379e 100644 --- a/Action/AutoCreateSubtask.php +++ b/Action/AutoCreateSubtask.php @@ -31,8 +31,8 @@ public function getActionRequiredParameters() 'multitasktitles' => t('Subtask Title(s)'), 'time_estimated' => t('Estimated Time in Hours'), 'duration' => t('Duration in days'), - 'check_box' => t('Apply to all Columns'), - 'duplicate' => t('Do not duplicate subtasks'), + 'check_box_all_columns' => t('Apply to all Columns'), + 'check_box_no_duplicates' => t('Do not duplicate subtasks'), ); } @@ -67,7 +67,7 @@ public function doAction(array $data) $subtasks = array_map('trim', explode("\r\n", isset($values['title']) ? $values['title'] : '')); $subtasksAdded = 0; - if ($this->getParam('duplicate') == true ){ + if ($this->getParam('check_box_no_duplicates') == true ){ $current_subtasks = $this->subtaskModel->getAll($data['task_id']); foreach ($current_subtasks as $current_subtask) { if (in_array($current_subtask['title'], $subtasks)) { @@ -112,7 +112,7 @@ public function doAction(array $data) public function hasRequiredCondition(array $data) { - if ($this->getParam('check_box')) { + if ($this->getParam('check_box_all_columns')) { return $data['task']['column_id'] == $data['task']['column_id']; } else { return $data['task']['column_id'] == $this->getParam('column_id'); From 493ee93a81cda9cc0543732e26c57059fbe88937 Mon Sep 17 00:00:00 2001 From: Craig Crosby Date: Thu, 24 Jan 2019 11:49:28 -0500 Subject: [PATCH 4/5] Update AutoCreateSubtaskVanilla.php --- Action/AutoCreateSubtaskVanilla.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Action/AutoCreateSubtaskVanilla.php b/Action/AutoCreateSubtaskVanilla.php index 5726aab..842655a 100644 --- a/Action/AutoCreateSubtaskVanilla.php +++ b/Action/AutoCreateSubtaskVanilla.php @@ -30,8 +30,8 @@ public function getActionRequiredParameters() 'user_id' => t('Assignee'), 'multitasktitles' => t('Subtask Title(s)'), 'time_estimated' => t('Estimated Time in Hours'), - 'check_box' => t('Apply to all Columns'), - 'duplicate' => t('Do not duplicate subtasks'), + 'check_box_all_columns' => t('Apply to all Columns'), + 'check_box_no_duplicates' => t('Do not duplicate subtasks'), ); } @@ -65,7 +65,7 @@ public function doAction(array $data) $subtasks = array_map('trim', explode("\r\n", isset($values['title']) ? $values['title'] : '')); $subtasksAdded = 0; - if ($this->getParam('duplicate') == true ){ + if ($this->getParam('check_box_no_duplicates') == true ){ $current_subtasks = $this->subtaskModel->getAll($data['task_id']); foreach ($current_subtasks as $current_subtask) { if (in_array($current_subtask['title'], $subtasks)) { @@ -110,7 +110,7 @@ public function doAction(array $data) public function hasRequiredCondition(array $data) { - if ($this->getParam('check_box')) { + if ($this->getParam('check_box_all_columns')) { return $data['task']['column_id'] == $data['task']['column_id']; } else { return $data['task']['column_id'] == $this->getParam('column_id'); From 7765e4994e43bfa9a69a005c9cacd0ec30ae0d3a Mon Sep 17 00:00:00 2001 From: Craig Crosby Date: Thu, 24 Jan 2019 11:52:30 -0500 Subject: [PATCH 5/5] Update Plugin.php --- Plugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugin.php b/Plugin.php index 7e2079d..6a0c4be 100644 --- a/Plugin.php +++ b/Plugin.php @@ -36,7 +36,7 @@ public function getPluginAuthor() public function getPluginVersion() { - return '1.0.4'; + return '2.0.0'; } public function getPluginDescription()