Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1fa3acae74 | |||
| d0d32db177 |
@@ -52,6 +52,7 @@ class RecurrenceController extends BaseController
|
|||||||
'recoreco_frequency' => $frequency,
|
'recoreco_frequency' => $frequency,
|
||||||
'recoreco_last_day' => isset($input['recoreco_last_day']) ? 1 : 0,
|
'recoreco_last_day' => isset($input['recoreco_last_day']) ? 1 : 0,
|
||||||
'recoreco_days_before' => isset($input['recoreco_days_before']) && ctype_digit((string) $input['recoreco_days_before']) ? (int) $input['recoreco_days_before'] : 0,
|
'recoreco_days_before' => isset($input['recoreco_days_before']) && ctype_digit((string) $input['recoreco_days_before']) ? (int) $input['recoreco_days_before'] : 0,
|
||||||
|
'recoreco_link_copies' => isset($input['recoreco_link_copies']) ? 1 : 0,
|
||||||
);
|
);
|
||||||
|
|
||||||
// Capture the anchor (the due date at enable time) -- the drift-free pattern. The engine
|
// Capture the anchor (the due date at enable time) -- the drift-free pattern. The engine
|
||||||
@@ -61,6 +62,12 @@ class RecurrenceController extends BaseController
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->taskMetadataModel->save($task['id'], $values);
|
$this->taskMetadataModel->save($task['id'], $values);
|
||||||
|
|
||||||
|
// Reconcile the template's duplicate links with the setting right away (removes existing
|
||||||
|
// links to its RecoReco clones when the option is off).
|
||||||
|
$model = new \Kanboard\Plugin\RecoReco\Model\RecoRecoModel($this->container);
|
||||||
|
$model->syncCloneLinks($task['id'], $values['recoreco_link_copies'] == 1);
|
||||||
|
|
||||||
$this->flash->success(t('Recurring schedule saved.'));
|
$this->flash->success(t('Recurring schedule saved.'));
|
||||||
|
|
||||||
return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true);
|
return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true);
|
||||||
@@ -76,6 +83,7 @@ class RecurrenceController extends BaseController
|
|||||||
'recoreco_frequency' => isset($meta['recoreco_frequency']) ? $meta['recoreco_frequency'] : 'monthly_day',
|
'recoreco_frequency' => isset($meta['recoreco_frequency']) ? $meta['recoreco_frequency'] : 'monthly_day',
|
||||||
'recoreco_last_day' => isset($meta['recoreco_last_day']) ? (int) $meta['recoreco_last_day'] : 0,
|
'recoreco_last_day' => isset($meta['recoreco_last_day']) ? (int) $meta['recoreco_last_day'] : 0,
|
||||||
'recoreco_days_before' => isset($meta['recoreco_days_before']) ? (int) $meta['recoreco_days_before'] : 0,
|
'recoreco_days_before' => isset($meta['recoreco_days_before']) ? (int) $meta['recoreco_days_before'] : 0,
|
||||||
|
'recoreco_link_copies' => isset($meta['recoreco_link_copies']) ? (int) $meta['recoreco_link_copies'] : 0,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -69,6 +69,8 @@ class RecoRecoModel extends Base
|
|||||||
$lastDay = isset($meta['recoreco_last_day']) && $meta['recoreco_last_day'] == 1;
|
$lastDay = isset($meta['recoreco_last_day']) && $meta['recoreco_last_day'] == 1;
|
||||||
$daysBefore = isset($meta['recoreco_days_before']) ? (int) $meta['recoreco_days_before'] : 0;
|
$daysBefore = isset($meta['recoreco_days_before']) ? (int) $meta['recoreco_days_before'] : 0;
|
||||||
$targetColumn = isset($meta['recoreco_target_column']) ? (int) $meta['recoreco_target_column'] : (int) $task['column_id'];
|
$targetColumn = isset($meta['recoreco_target_column']) ? (int) $meta['recoreco_target_column'] : (int) $task['column_id'];
|
||||||
|
// Default off: only keep the duplicate link when explicitly turned on.
|
||||||
|
$linkCopies = isset($meta['recoreco_link_copies']) && $meta['recoreco_link_copies'] == 1;
|
||||||
|
|
||||||
$cursor = (int) $task['date_due'];
|
$cursor = (int) $task['date_due'];
|
||||||
$synced = isset($meta['recoreco_synced_due']) ? (int) $meta['recoreco_synced_due'] : null;
|
$synced = isset($meta['recoreco_synced_due']) ? (int) $meta['recoreco_synced_due'] : null;
|
||||||
@@ -103,9 +105,35 @@ class RecoRecoModel extends Base
|
|||||||
$spawned++;
|
$spawned++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Reconcile the duplicate links with the setting (removes both new and old ones when off).
|
||||||
|
$this->syncCloneLinks($task_id, $linkCopies);
|
||||||
|
|
||||||
return $spawned;
|
return $spawned;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reconcile a template's "is a duplicate of" links with the link-copies setting. When off, remove
|
||||||
|
* the links to THIS template's own RecoReco clones (identified by recoreco_source, so manual
|
||||||
|
* links are left untouched). When on, do nothing -- new spawns already carry the link.
|
||||||
|
*
|
||||||
|
* @param int $template_id
|
||||||
|
* @param bool $linkCopies
|
||||||
|
*/
|
||||||
|
public function syncCloneLinks($template_id, $linkCopies)
|
||||||
|
{
|
||||||
|
if ($linkCopies) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($this->taskLinkModel->getAll($template_id) as $link) {
|
||||||
|
$opposite = (int) $link['task_id'];
|
||||||
|
|
||||||
|
if ((int) $this->taskMetadataModel->get($opposite, 'recoreco_source', 0) === (int) $template_id) {
|
||||||
|
$this->taskLinkModel->remove($link['id']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The first occurrence: respect an explicitly future anchor (the due date the user set) as the
|
* The first occurrence: respect an explicitly future anchor (the due date the user set) as the
|
||||||
* first one; otherwise jump to the next occurrence on/after now.
|
* first one; otherwise jump to the next occurrence on/after now.
|
||||||
@@ -146,6 +174,10 @@ class RecoRecoModel extends Base
|
|||||||
// Reset the "[DUPLICATE]" prefix back to the source title (no events).
|
// Reset the "[DUPLICATE]" prefix back to the source title (no events).
|
||||||
$this->taskModificationModel->update(array('id' => $newId, 'title' => $template['title']), false);
|
$this->taskModificationModel->update(array('id' => $newId, 'title' => $template['title']), false);
|
||||||
|
|
||||||
|
// Kanboard's duplicate() adds an "is a duplicate of" task link between the template and the
|
||||||
|
// clone. It is reconciled with the recoreco_link_copies setting by syncCloneLinks() after
|
||||||
|
// the spawn loop (kept when on, removed when off).
|
||||||
|
|
||||||
// Mark the clone: white icon + cannot itself be made recurring; record its source template.
|
// Mark the clone: white icon + cannot itself be made recurring; record its source template.
|
||||||
$this->taskMetadataModel->save($newId, array(
|
$this->taskMetadataModel->save($newId, array(
|
||||||
'recoreco_clone' => 1,
|
'recoreco_clone' => 1,
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ class Plugin extends Base
|
|||||||
|
|
||||||
public function getPluginVersion()
|
public function getPluginVersion()
|
||||||
{
|
{
|
||||||
return '0.3.0';
|
return '0.3.2';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getPluginHomepage()
|
public function getPluginHomepage()
|
||||||
|
|||||||
@@ -34,6 +34,11 @@
|
|||||||
<?= $this->form->label(t('Create the copy this many days before the due date'), 'recoreco_days_before') ?>
|
<?= $this->form->label(t('Create the copy this many days before the due date'), 'recoreco_days_before') ?>
|
||||||
<input type="number" name="recoreco_days_before" min="0" value="<?= $this->text->e($values['recoreco_days_before']) ?>">
|
<input type="number" name="recoreco_days_before" min="0" value="<?= $this->text->e($values['recoreco_days_before']) ?>">
|
||||||
|
|
||||||
|
<?= $this->form->checkbox('recoreco_link_copies', t('Link copies to the template'), 1, $values['recoreco_link_copies'] == 1) ?>
|
||||||
|
<p class="form-help">
|
||||||
|
<?= t('When on, the template keeps a link to each copy -- a running count and one-click navigation to every one. Off by default; best left off for frequent (daily/weekly) schedules to avoid piling up links.') ?>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
|
||||||
<?= $this->modal->submitButtons() ?>
|
<?= $this->modal->submitButtons() ?>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
Reference in New Issue
Block a user