Fix batch (joomla#57)

* Fix workflow batch
chmst · Apr 21, 2020 · be6b633 · be6b633
1 parent 68ceb20
commit be6b633
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/administrator/components/com_content/tmpl/articles/default_batch_body.php b/administrator/components/com_content/tmpl/articles/default_batch_body.php
@@ -10,6 +10,9 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Component\ComponentHelper;
+
+$params = ComponentHelper::getParams('com_content');
 
 $published = $this->state->get('filter.published');
 
@@ -42,7 +45,7 @@
 				<?php echo LayoutHelper::render('joomla.html.batch.tag', []); ?>
 			</div>
 		</div>
-		<?php if ($user->authorise('core.admin', 'com_content')) : ?>
+		<?php if ($user->authorise('core.admin', 'com_content') && $params->get('workflows_enable', 1)) : ?>
 		<div class="form-group col-md-6">
 			<div class="controls">
 				<?php echo LayoutHelper::render('joomla.html.batch.workflowstage', ['extension' => 'com_content']); ?>

diff --git a/libraries/src/MVC/Model/WorkflowBehaviorTrait.php b/libraries/src/MVC/Model/WorkflowBehaviorTrait.php
@@ -417,10 +417,10 @@ protected function getStageForNewItem(Form $form, $data)
 	 *
 	 * @since   4.0.0
 	 */
-	public function batchWorkflowStage(int $value, array $pks, array $contexts) {
-
+	public function batchWorkflowStage(int $value, array $pks, array $contexts)
+	{
 		$user = Factory::getApplication()->getIdentity();
-		/** @var  $workflow */
+
 		$workflow = Factory::getApplication()->bootComponent('com_workflow');
 
 		if (!$user->authorise('core.admin', $this->option))
@@ -429,7 +429,7 @@ public function batchWorkflowStage(int $value, array $pks, array $contexts) {
 		}
 
 		// Get workflow stage information
-		$stage = $workflow->createTable('Stage', 'Administrator');
+		$stage = $workflow->getMVCFactory()->createTable('Stage', 'Administrator');
 
 		if (empty($value) || !$stage->load($value))
 		{