Merge remote-tracking branch 'origin/cake3'

# Conflicts: # README.md # composer.json # src/Controller/Admin/QueuedJobsController.php
dereuromark · Jul 19, 2020 · d31e261 · d31e261
2 parents dde5540 + b252ae9
commit d31e261
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Controller/Admin/QueuedJobsController.php b/src/Controller/Admin/QueuedJobsController.php
@@ -114,6 +114,7 @@ public function view($id = null) {
 
 		$this->set(compact('queuedJob'));
 		$this->viewBuilder()->setOption('serialize', ['queuedJob']);
+		$this->viewBuilder()->setHelpers(['Tools.Time', 'Tools.Format', 'Shim.Configure']);
 	}
 
 	/**

diff --git a/templates/Admin/Queue/processes.php b/templates/Admin/Queue/processes.php
@@ -12,7 +12,7 @@
 
 <nav class="col-md-3 col-xs-12 large-3 medium-4 columns" id="actions-sidebar">
 	<ul class="side-nav nav nav-pills nav-stacked">
-		<li><?= $this->Html->link(__d('queue', 'Dashboard'), ['controller' => 'Queue', 'action' => 'index']) ?></li>
+		<li><?= $this->Html->link(__d('queue', 'Dashboard'), ['controller' => 'Queue', 'action' => 'index'], ['class' => 'btn margin btn-default']) ?></li>
 		<li><?php echo $this->Html->link(__d('queue', 'List {0}', __d('queue', 'Queue Processes')), ['controller' => 'QueueProcesses', 'action' => 'index'], ['class' => 'btn margin btn-primary']); ?></li>
 	</ul>
 </nav>
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,6 +114,7 @@ public function view($id = null) { @@
     		$this->set(compact('queuedJob'));
     		$this->viewBuilder()->setOption('serialize', ['queuedJob']);
+    		$this->viewBuilder()->setHelpers(['Tools.Time', 'Tools.Format', 'Shim.Configure']);
     	}
     	/**
@@ Expand Down @@