Auto reset

dereuromark · Mar 8, 2019 · 8ef07d0 · 8ef07d0
1 parent 5aebcc8
commit 8ef07d0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/src/Controller/Admin/QueuedJobsController.php b/src/Controller/Admin/QueuedJobsController.php
@@ -124,6 +124,17 @@ public function import() {
 
 				unset($data['id']);
 				$data['created'] = new FrozenTime($data['created']);
+
+				if ($this->request->getData('reset')) {
+					$data['fetched'] = null;
+					$data['completed'] = null;
+					$data['progress'] = null;
+					$data['failed'] = 0;
+					$data['failure_message'] = null;
+					$data['workerkey'] = null;
+					$data['status'] = null;
+				}
+
 				if ($data['notbefore']) {
 					$data['notbefore'] = new FrozenTime($data['notbefore']);
 				}

diff --git a/src/Template/Admin/QueuedJobs/import.ctp b/src/Template/Admin/QueuedJobs/import.ctp
@@ -4,21 +4,22 @@
  */
 ?>
 <nav class="large-3 medium-4 columns" id="actions-sidebar">
-    <ul class="side-nav">
-        <li class="heading"><?= __('Actions') ?></li>
-        <li><?= $this->Html->link('Back', ['action' => 'index']); ?></li>
-    </ul>
+	<ul class="side-nav">
+		<li class="heading"><?= __('Actions') ?></li>
+		<li><?= $this->Html->link('Back', ['action' => 'index']); ?></li>
+	</ul>
 </nav>
 <div class="releases form large-9 medium-8 columns content">
-    <h2>Import</h2>
+	<h2>Import</h2>
 
-    <?= $this->Form->create(null, ['type' => 'file']) ?>
-    <fieldset>
-        <legend><?= __('Import Job from exported JSON') ?></legend>
-        <?php
-            echo $this->Form->control('file', ['type' => 'file', 'required' => true, 'accept' => '.json']);
-        ?>
-    </fieldset>
-    <?= $this->Form->button(__('Submit')) ?>
-    <?= $this->Form->end() ?>
+	<?= $this->Form->create(null, ['type' => 'file']) ?>
+	<fieldset>
+		<legend><?= __('Import Job from exported JSON') ?></legend>
+		<?php
+			echo $this->Form->control('file', ['type' => 'file', 'required' => true, 'accept' => '.json']);
+			echo $this->Form->control('reset', ['type' => 'checkbox', 'default' => true]);
+		?>
+	</fieldset>
+	<?= $this->Form->button(__('Submit')) ?>
+	<?= $this->Form->end() ?>
 </div>