[4.0] State to stage fixes

administrator/components/com_content/Model/ArticleModel.php

@@ -17,7 +17,7 @@
 use Joomla\CMS\Model\Form;
 use Joomla\Component\Content\Administrator\Helper\ContentHelper;
 use Joomla\Component\Workflow\Administrator\Helper\WorkflowHelper;
-use Joomla\Component\Workflow\Administrator\Table\StateTable;
+use Joomla\Component\Workflow\Administrator\Table\StageTable;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\MVC\Model\AdminModel;
@@ -196,17 +196,17 @@ protected function batchCopy($value, $pks, $contexts)
 	}
 
 	/**
-	 * Batch change workflow state or current.
+	 * Batch change workflow stage or current.
 	 *
-	 * @param   integer  $value     The workflow state ID.
+	 * @param   integer  $value     The workflow stage ID.
 	 * @param   array    $pks       An array of row IDs.
 	 * @param   array    $contexts  An array of item contexts.
 	 *
 	 * @return  mixed  An array of new IDs on success, boolean false on failure.
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
-	protected function batchWorkflowState($value, $pks, $contexts)
+	protected function batchWorkflowStage($value, $pks, $contexts)
 	{
 		$user = Factory::getUser();
 
@@ -215,19 +215,19 @@ protected function batchWorkflowState($value, $pks, $contexts)
 			$this->setError(Text::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EXECUTE_TRANSITION'));
 		}
 
-		// Get state information
-		$state = new StateTable($this->_db);
+		// Get workflow stage information
+		$stage = new StageTable($this->_db);
 
-		if (empty($value) || !$state->load($value))
+		if (empty($value) || !$stage->load($value))
 		{
-			Factory::getApplication()->enqueueMessage(Text::sprintf('JGLOBAL_BATCH_WORKFLOW_STATE_ROW_NOT_FOUND'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::sprintf('JGLOBAL_BATCH_WORKFLOW_STAGE_ROW_NOT_FOUND'), 'error');
 
 			return false;
 		}
 
 		if (empty($pks))
 		{
-			Factory::getApplication()->enqueueMessage(Text::sprintf('JGLOBAL_BATCH_WORKFLOW_STATE_ROW_NOT_FOUND'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::sprintf('JGLOBAL_BATCH_WORKFLOW_STAGE_ROW_NOT_FOUND'), 'error');
 
 			return false;
 		}
@@ -358,13 +358,13 @@ protected function canDelete($record)
 	{
 		if (!empty($record->id))
 		{
-			$state = new StateTable($this->_db);
+			$stage = new StageTable($this->_db);
 
 			$workflow = new Workflow(['extension' => 'com_content']);
 
 			$assoc = $workflow->getAssociation($record->id);
 
-			if (!$state->load($assoc->state_id) || $state->condition != Workflow::TRASHED)
+			if (!$stage->load($assoc->stage_id) || $stage->condition != Workflow::TRASHED)
 			{
 				return false;
 			}
@@ -541,7 +541,7 @@ public function getForm($data = array(), $loadData = true)
 				// Transition field
 				$assoc = $workflow->getAssociation($table->id);
 
-				$form->setFieldAttribute('transition', 'workflow_state', (int) $assoc->state_id);
+				$form->setFieldAttribute('transition', 'workflow_stage', (int) $assoc->stage_id);
 			}
 		}
 		else
@@ -780,7 +780,7 @@ public function save($data)
 		}
 
 		$workflowId = 0;
-		$stateId = 0;
+		$stageId = 0;
 
 		// Set status depending on category
 		if (empty($data['id']))
@@ -794,7 +794,7 @@ public function save($data)
 				return false;
 			}
 
-			$stateId = (int) $workflow->state_id;
+			$stageId = (int) $workflow->stage_id;
 			$workflowId = (int) $workflow->id;
 
 			// B/C state
@@ -823,14 +823,14 @@ public function save($data)
 			$query	->select($db->quoteName(['ws.id', 'ws.condition']))
 					->from($db->quoteName('#__workflow_stages', 'ws'))
 					->from($db->quoteName('#__workflow_transitions', 'wt'))
-					->where($db->quoteName('wt.to_state_id') . ' = ' . $db->quoteName('ws.id'))
+					->where($db->quoteName('wt.to_stage_id') . ' = ' . $db->quoteName('ws.id'))
 					->where($db->quoteName('wt.id') . ' = ' . (int) $data['transition'])
 					->where($db->quoteName('ws.published') . ' = 1')
 					->where($db->quoteName('wt.published') . ' = 1');
 
-			$state = $db->setQuery($query)->loadObject();
+			$stage = $db->setQuery($query)->loadObject();
 
-			if (empty($state->id))
+			if (empty($stage->id))
 			{
 				$this->setError(Text::_('COM_CONTENT_WORKFLOW_TRANSITION_NOT_ALLOWED'));
 

administrator/components/com_content/forms/filter_articles.xml

@@ -11,7 +11,7 @@
 
 		<field
 				name="state"
-				type="workflowstate"
+				type="workflowstage"
 				label="COM_CONTENT_STATES"
 				onchange="this.form.submit();"
 				activeonly="true"

administrator/components/com_content/forms/filter_featured.xml

@@ -11,7 +11,7 @@
 
 		<field
 				name="state"
-				type="workflowstate"
+				type="workflowstage"
 				label="COM_CONTENT_STATES"
 				onchange="this.form.submit();"
 				activeonly="true"

administrator/components/com_workflow/Model/TransitionsModel.php

@@ -140,8 +140,8 @@ public function getListQuery()
 			't.to_stage_id',
 			't.published',
 			't.ordering',
+			)
 		);
-		)
 
 		$select[] = $db->quoteName('f_stage.title', 'from_stage');
 		$select[] = $db->quoteName('t_stage.title', 'to_stage');

administrator/components/com_workflow/forms/transition.xml

@@ -21,7 +21,7 @@
 		<field
 			name="from_stage_id"
 			type="sql"
-			label="COM_WORKFLOW_FROM_STATE"
+			label="COM_WORKFLOW_FROM_STAGE"
 			required="true"
 			sql_select="id as value, title as from_stage_id"
 			sql_from="#__workflow_stages"
@@ -31,7 +31,7 @@
 		<field
 			name="to_stage_id"
 			type="sql"
-			label="COM_WORKFLOW_TO_STATE"
+			label="COM_WORKFLOW_TO_STAGE"
 			required="true"
 			sql_select="id as value, title as to_stage_id"
 			sql_from="#__workflow_stages"

libraries/src/Form/Field/WorkflowStateField.php → libraries/src/Form/Field/WorkflowStageField.php

@@ -15,19 +15,19 @@
 use Joomla\CMS\Form\Field\GroupedlistField;
 
 /**
- * Workflow States field.
+ * Workflow Stages field.
  *
  * @since  __DEPLOY_VERSION__
  */
-class WorkflowStateField extends GroupedlistField
+class WorkflowStageField extends GroupedlistField
 {
 	/**
 	 * The form field type.
 	 *
 	 * @var     string
 	 * @since  __DEPLOY_VERSION__
 	 */
-	protected $type = 'WorkflowState';
+	protected $type = 'WorkflowStage';
 
 	/**
 	 * The extension where we're
@@ -38,7 +38,7 @@ class WorkflowStateField extends GroupedlistField
 	protected $extension = 'com_content';
 
 	/**
-	 * Show only the states which has an item attached
+	 * Show only the stages which has an item attached
 	 *
 	 * @var     boolean
 	 * @since  __DEPLOY_VERSION__
@@ -91,10 +91,10 @@ protected function getGroups()
 		$db    = Factory::getDbo();
 		$query = $db->getQuery(true);
 
-		// Select distinct states for existing articles
+		// Select distinct stages for existing articles
 		$query
 				->select('DISTINCT ' . $db->quoteName('ws.id', 'workflow_stage_id'))
-				->select($db->quoteName(['ws.title', 'w.title', 'w.id', 'w.ordering'], ['workflow_state_title', 'workflow_title', 'workflow_id', 'ordering']))
+				->select($db->quoteName(['ws.title', 'w.title', 'w.id', 'w.ordering'], ['workflow_stage_title', 'workflow_title', 'workflow_id', 'ordering']))
 				->from($db->quoteName('#__workflow_stages', 'ws'))
 				->from($db->quoteName('#__workflows', 'w'))
 				->where($db->quoteName('ws.workflow_id') . ' = ' . $db->quoteName('w.id'))
@@ -110,25 +110,25 @@ protected function getGroups()
 
 		}
 
-		$states = $db->setQuery($query)->loadObjectList();
+		$stages = $db->setQuery($query)->loadObjectList();
 
-		$workflowStates = array();
+		$workflowStages = array();
 
-		// Grouping the states by workflow
-		foreach ($states as $state)
+		// Grouping the stages by workflow
+		foreach ($stages as $stage)
 		{
 			// Using workflow ID to differentiate workflows having same title
-			$workflowStateKey = $state->workflow_title . ' (' . $state->workflow_id . ')';
+			$workflowStageKey = $stage->workflow_title . ' (' . $stage->workflow_id . ')';
 
-			if (!array_key_exists($workflowStateKey, $workflowStates))
+			if (!array_key_exists($workflowStageKey, $workflowStages))
 			{
-				$workflowStates[$workflowStateKey] = array();
+				$workflowStages[$workflowStageKey] = array();
 			}
 
-			$workflowStates[$workflowStateKey][] = HTMLHelper::_('select.option', $state->workflow_stage_id, $state->workflow_state_title);
+			$workflowStages[$workflowStageKey][] = HTMLHelper::_('select.option', $stage->workflow_stage_id, $stage->workflow_stage_title);
 		}
 
 		// Merge any additional options in the XML definition.
-		return array_merge(parent::getGroups(), $workflowStates);
+		return array_merge(parent::getGroups(), $workflowStages);
 	}
 }

libraries/src/MVC/Model/AdminModel.php

@@ -105,7 +105,7 @@ abstract class AdminModel extends FormModel
 		'assetgroup_id' => 'batchAccess',
 		'language_id' => 'batchLanguage',
 		'tag' => 'batchTag',
-		'workflowstage_id' => 'batchWorkflowState',
+		'workflowstage_id' => 'batchWorkflowStage',
 	);
 
 	/**

modules/mod_articles_archive/mod_articles_archive.xml

@@ -32,7 +32,7 @@
 
 				<field
 					name="state"
-					type="workflowstate"
+					type="workflowstage"
 					multiple="true"
 					size="5"
 					label="MOD_ARTICLES_ARCHIVE_CHOOSE_STATE"