Fix undefined property when editing stages/transitions

joomla · Feb 9, 2020 · a5bca08 · a5bca08
1 parent 0143e95
commit a5bca08
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/administrator/components/com_workflow/Model/StageModel.php b/administrator/components/com_workflow/Model/StageModel.php
@@ -156,7 +156,14 @@ protected function canEditState($record)
 	{
 		$user = Factory::getUser();
 		$app = Factory::getApplication();
-		$extension = $app->getUserStateFromRequest('com_workflow.state.filter.extension', 'extension', null, 'cmd');
+		$context = $this->option . '.' . $this->name;
+		$extension = $app->getUserStateFromRequest($context . '.filter.extension', 'extension', null, 'cmd');
+
+		if (!\property_exists($record, 'workflow_id'))
+		{
+			$workflowID          = $app->getUserStateFromRequest($context . '.filter.workflow_id', 'workflow_id', 0, 'int');
+			$record->workflow_id = $workflowID;
+		}
 
 		$table = $this->getTable('Workflow', 'Administrator');
 

diff --git a/administrator/components/com_workflow/Model/TransitionModel.php b/administrator/components/com_workflow/Model/TransitionModel.php
@@ -82,7 +82,14 @@ protected function canEditState($record)
 	{
 		$user = Factory::getUser();
 		$app = Factory::getApplication();
-		$extension = $app->getUserStateFromRequest('com_workflow.transition.filter.extension', 'extension', null, 'cmd');
+		$context = $this->option . '.' . $this->name;
+		$extension = $app->getUserStateFromRequest($context . '.filter.extension', 'extension', null, 'cmd');
+
+		if (!\property_exists($record, 'workflow_id'))
+		{
+			$workflowID          = $app->getUserStateFromRequest($context . '.filter.workflow_id', 'workflow_id', 0, 'int');
+			$record->workflow_id = $workflowID;
+		}
 
 		$table = $this->getTable('Workflow', 'Administrator');
 
@@ -234,7 +241,7 @@ public function getForm($data = array(), $loadData = true)
 			$data = (object) $this->loadFormData();
 		}
 
-		if (!$this->canEditState($data))
+		if (!$this->canEditState((object) $data))
 		{
 			// Disable fields for display.
 			$form->setFieldAttribute('published', 'disabled', 'true');