Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix batch #57

Merged
merged 10 commits into from
Apr 21, 2020
Merged

Fix batch #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
81f8387
Remove condition from workflow component
bembelimen Mar 14, 2020
dc947de
Load Workflow plugins on transition generation
bembelimen Mar 14, 2020
aa647e6
Merge branch 'workflow-v3' of github.com:bembelimen/joomla-cms into w…
bembelimen Mar 14, 2020
992cf39
Remove condition from com_content
bembelimen Mar 24, 2020
ef80eee
Merge branch 'workflow-v3' of github.com:bembelimen/joomla-cms into w…
bembelimen Mar 24, 2020
fe20b39
Cleanup content from workflow
bembelimen Mar 25, 2020
af71b1e
Merge branch 'workflow-v3' of github.com:bembelimen/joomla-cms into w…
bembelimen Mar 25, 2020
ffc9cb7
Merge branch 'workflow-v3' of github.com:bembelimen/joomla-cms into w…
bembelimen Apr 21, 2020
2f6f8f1
Fix workflow batch
bembelimen Apr 21, 2020
3975601
Remove comment
bembelimen Apr 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion administrator/components/com_content/tmpl/articles/default_batch_body.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down Expand Up @@ -42,7 +45,7 @@
<?php echo LayoutHelper::render('joomla.html.batch.tag', []); ?>
</div>
</div>
<?php if ($user->authorise('core.admin', 'com_content')) : ?>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that's the wrong approach, you should ask the service if the workflow is enabled for this view. Also as example for other developer

<?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']); ?>
Expand Down
8 changes: 4 additions & 4 deletions libraries/src/MVC/Model/WorkflowBehaviorTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't there be the class name?


$workflow = Factory::getApplication()->bootComponent('com_workflow');

if (!$user->authorise('core.admin', $this->option))
Expand All @@ -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))
{
Expand Down