[4.0][Workflow] Add component specific workflow conditions by HLeithner · Pull Request #21585 · joomla/joomla-cms

HLeithner · 2018-08-13T10:26:51Z

Pull Request for Issue # .

Summary of Changes

Introduce condition constants into com_content container used for the workflow. This provides the possibility to define conditions per component. This also reintroduce the archive condition in com_content.

Testing Instructions

You need the latest state/stages fixes from PR [4.0] State to stage fixes #21566
regenerate the autoloader
Test com_content frontend/backend with all stages.

Expected result

You should have a "archive" condition.

Additional

@alikon please check the db changes, you already did the enum change for postgresql

alikon · 2018-08-13T10:51:14Z

administrator/components/com_content/Extension/ContentComponent.php

+
+      $query  = $db->getQuery(true);
+
+      $query	->select($db->quoteName('condition'))


remove spaces

wilsonge · 2018-08-14T16:36:16Z

OK can you fix conflicts here - then let's get this one tested

…avior)

HLeithner · 2018-08-14T21:46:10Z

@wilsonge rebase done, @bembelimen can you retest the pr?

wilsonge · 2018-08-14T21:59:26Z

administrator/components/com_content/Extension/ContentComponent.php

+			$section = $parts[1];
+		}
+
+		$join  = $db->quoteName('#__content') . ' AS c ON ct.content_item_id=c.id';


Use the quoteName second param here instead of hardcoding the AS

wilsonge · 2018-08-14T22:00:40Z

administrator/components/com_content/Extension/ContentComponent.php

 	 * registering HTML services.
 	 *
-	 * @param   ContainerInterface  $container  The container
+	 * @param   ContainerInterface $container The container


Code style is 3 spaces then TypeHint 2 spaces then variable name 2 spaces then description. You've broken it in every function of this file (hence the code style failure)

wilsonge · 2018-08-14T22:01:20Z

administrator/components/com_content/Model/ArticlesModel.php

 		elseif (!is_numeric($workflowStage))
 		{
-			$query->where($db->quoteName('ws.condition') . ' IN (' . $query->quote(Workflow::PUBLISHED) . ',' . $query->quote(Workflow::UNPUBLISHED) . ')');
+			$query->where($db->quoteName('ws.condition') . ' IN (' .


Use $query->whereIn function

wilsonge · 2018-08-14T22:01:46Z

administrator/components/com_content/Model/ArticlesModel.php

-					$query->where($db->quoteName('ws.condition') . ' = ' . $query->quote($condition));
-			}
-		}
+      $query->where($db->quoteName('ws.condition') . ' = ' . (int) $condition);


tabs not spaces please

wilsonge · 2018-08-14T22:02:09Z

administrator/components/com_content/forms/filter_articles.xml

+			<option value="">COM_WORKFLOW_SELECT_CONDITION</option>
 		</field>

+


remove the extra space here

wilsonge · 2018-08-14T22:02:23Z

administrator/components/com_content/Model/FeaturedModel.php

 		elseif (!is_numeric($workflowStage))
 		{
-			$query->where($db->quoteName('ws.condition') . ' IN ("0","1")');
+      $query->where($db->quoteName('ws.condition') . ' IN (' .


tabs here and use whereIn

wilsonge · 2018-08-14T22:04:27Z

libraries/src/Workflow/Workflow.php

-	];
-
+	/**
+	 * @var oomla\Database\DatabaseDriver


wilsonge · 2018-08-15T14:19:47Z

administrator/components/com_content/Model/ArticlesModel.php

 		elseif (!is_numeric($workflowStage))
 		{
-			$query->where($db->quoteName('ws.condition') . ' IN (' . $query->quote(Workflow::PUBLISHED) . ',' . $query->quote(Workflow::UNPUBLISHED) . ')');
+			$query->whereIn($db->quoteName('ws.condition'), [


The parameters need to be on a new line. So

$query->whereIn( $db->quoteName('ws.condition'), [

and for the other 2 places

HLeithner · 2018-08-15T14:39:36Z

@wilsonge may could you describe it for an idiot?

Quy · 2018-08-15T14:43:42Z

administrator/components/com_content/forms/filter_articles.xml

 				name="condition"
-				type="list"
-				label="COM_CONTENT_STATES"
+				type="workflowcondition"


Reduce indentation by 1 from lines 24-28

Quy · 2018-08-15T14:43:51Z

administrator/components/com_content/forms/filter_articles.xml

+				description="COM_WORKFLOW_CONDITION_DESC"
 				onchange="this.form.submit();"
+				extension="com_content"
 		>


Indent by 1.

wilsonge · 2018-08-15T14:52:50Z

administrator/components/com_content/Model/ArticlesModel.php

 		elseif (!is_numeric($workflowStage))
 		{
-			$query->whereIn($db->quoteName('ws.condition'), [
+			$query->whereIn($db->quoteName('ws.condition'),


Nope :) Look at my example again :P

$query->whereIn( $db->quoteName('ws.condition'), [

wilsonge · 2018-08-16T08:31:51Z

administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-05-15.sql

 (2, 0, 2, 1, 1, 'Published', '', 1, 1),
 (3, 0, 3, 1, 1, 'Trashed', '', -2, 0),
-(4, 0, 4, 1, 1, 'Archived', '', 1, 0);
+(4, 0, 4, 1, 1, 'Archived', '', 2, 0);


This needs to be done in the postgres files too

wilsonge · 2018-08-16T11:10:11Z

Now you can fix codestyle again :D

HLeithner · 2018-08-16T11:36:50Z

YaY

alikon · 2018-08-16T11:55:51Z

administrator/components/com_workflow/Model/WorkflowsModel.php

+			->from($db->quoteName('#__workflow_stages'))
+			->where($db->quoteName('workflow_id') . ' IN(' . implode(',', $ids) . ')')
+			->where($db->quoteName('published') . '>= 0')
+			->group('workflow_id');


please use $db->quoteName()

alikon · 2018-08-16T11:56:14Z

administrator/components/com_workflow/Model/WorkflowsModel.php

+			->from($db->quoteName('#__workflow_transitions'))
+			->where($db->quoteName('workflow_id') . ' IN(' . implode(',', $ids) . ')')
+			->where($db->quoteName('published') . '>= 0')
+			->group('workflow_id');


please use $db->quoteName()

infograf768 · 2018-08-16T15:46:39Z

libraries/src/Form/Field/WorkflowconditionField.php


 	/**
-	 * The extension where we're
+	 * The component and section seperated by ".".


separated not seperated. twice

bembelimen · 2018-08-17T08:17:20Z

I have tested this item ✅ successfully on 887f57e

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/21585.}

infograf768 · 2018-08-17T09:09:33Z

Looks ok, although I do not have anymore the Articles - Archived module available in the list of new modules to create and therefore can't test archived articles.

HLeithner · 2018-08-17T09:15:20Z

The module isn't part of this PR and should comeback when archive is restored. This PR is only the base that it is possible to do the archive behavior

infograf768 · 2018-08-17T09:18:20Z

It is apparently replaced by a Module called Articles-List which is not in the list of modules (in the modules/ folder)

There we have a "Choose State" field where it looks like it displays a workflow with its default stages.
By default it is set to Archived and the result in frontend is not a display of the Archived articles

EDIT: In fact it is the archived module which denomination has changed to Articles - List...

infograf768 · 2018-08-17T10:11:57Z

I have tested this item ✅ successfully on 887f57e

Let's this get in as other PRs are dependent from it.

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/21585.}

ghost · 2018-08-17T10:16:28Z

Ready to Commit after two successful tests.

joomla-cms-bot added the PR-4.0-dev label Aug 13, 2018

HLeithner mentioned this pull request Aug 13, 2018

Workflow - archive #21533

Closed

alikon reviewed Aug 13, 2018

View reviewed changes

brianteeman added the New Feature Workflow label Aug 14, 2018

HLeithner and others added 4 commits August 14, 2018 23:42

Add component specific workflow conditions.

29cddae

Archived articles should not be visible when not filtered (=> 3.x beh…

2eeef28

…avior)

CS

31a2fb2

Fixed missing namespace.

789aef1

HLeithner force-pushed the workflow-conditions branch from ac1ea48 to 789aef1 Compare August 14, 2018 21:44

wilsonge reviewed Aug 14, 2018

View reviewed changes

libraries/src/Workflow/Workflow.php Outdated

];

/**

* @var oomla\Database\DatabaseDriver

Copy link
Copy Markdown

Contributor

wilsonge Aug 14, 2018

Choose a reason for hiding this comment

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

Joomla

HLeithner added 2 commits August 15, 2018 10:19

CS

353dd28

Doc fixes and removed archive state from featured published filter.

0cb03a6

ggppdk mentioned this pull request Aug 15, 2018

[4.0] [Workflow] Restore publish, unpublish, archive, trash tasks to AdminController for extensions using workflow (and readd them to backend articles manager) #21629

Closed

HLeithner added 2 commits August 15, 2018 16:01

Make drone happy

ccc8dfd

Merge remote-tracking branch 'upstream/4.0-dev' into workflow-conditions

b4864ec

wilsonge reviewed Aug 15, 2018

View reviewed changes

Drone...

3bcf122

Quy reviewed Aug 15, 2018

View reviewed changes

wilsonge reviewed Aug 15, 2018

View reviewed changes

cs

7e82fa4

Merge remote-tracking branch 'upstream/4.0-dev' into workflow-conditions

e4e0117

wilsonge reviewed Aug 16, 2018

View reviewed changes

HLeithner added 2 commits August 16, 2018 11:03

Postgresql update, add extension parameter to getCondictions()

fc380fc

Fix condition filter

338676b

cs

1145e90

alikon reviewed Aug 16, 2018

View reviewed changes

Use quoteName

1fb2915

HLeithner mentioned this pull request Aug 16, 2018

[4.0][Workflow] Remove com_content defaults from workflow code #21641

Merged

HLeithner added 2 commits August 16, 2018 15:13

Merge remote-tracking branch 'upstream/4.0-dev' into workflow-conditions

7dd9534

Better documenation.

4e428b4

infograf768 reviewed Aug 16, 2018

View reviewed changes

HLeithner added 2 commits August 17, 2018 10:14

Typo

6a0332c

Merge remote-tracking branch 'upstream/4.0-dev' into workflow-conditions

887f57e

joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Aug 17, 2018

wilsonge merged commit aca906d into joomla:4.0-dev Aug 17, 2018

joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Aug 17, 2018

wilsonge added this to the Joomla 4.0 milestone Aug 17, 2018

This was referenced Aug 19, 2018

[4.0] Add show all articles filter #21704

Merged

[4.0] Workflow prevent trashing of used stages/workflows #21579

Merged

HLeithner deleted the workflow-conditions branch March 29, 2020 19:22


		$query = $db->getQuery(true);

		$query ->select($db->quoteName('condition'))

		<option value="">COM_WORKFLOW_SELECT_CONDITION</option>
		</field>

Uh oh!

Conversation

HLeithner commented Aug 13, 2018

Summary of Changes

Testing Instructions

Expected result

Additional

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wilsonge commented Aug 14, 2018

Uh oh!

HLeithner commented Aug 14, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wilsonge Aug 14, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wilsonge Aug 14, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

HLeithner commented Aug 15, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wilsonge commented Aug 16, 2018

Uh oh!

HLeithner commented Aug 16, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bembelimen commented Aug 17, 2018

Uh oh!

infograf768 commented Aug 17, 2018

Uh oh!

HLeithner commented Aug 17, 2018

Uh oh!

infograf768 commented Aug 17, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

infograf768 commented Aug 17, 2018

Uh oh!

ghost commented Aug 17, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

wilsonge Aug 14, 2018 •

edited

Loading

wilsonge Aug 14, 2018 •

edited

Loading

infograf768 commented Aug 17, 2018 •

edited

Loading