added workflow id from model in both frontend and backend

Author: Dileepadari

administrator/components/com_content/src/Model/ArticleModel.php

@@ -404,6 +404,11 @@ public function getItem($pk = null)
             if (!empty($item->id)) {
                 $item->tags = new TagsHelper();
                 $item->tags->getTagIds($item->id, 'com_content.article');
+                $workflow_assoc = $this->workflow->getAssociation($item->id);
+
+                if (!empty($workflow_assoc->workflow_id)) {
+                    $item->workflow_id = $workflow_assoc->workflow_id;
+                }
 
                 $item->featured_up   = null;
                 $item->featured_down = null;

administrator/components/com_content/tmpl/article/edit.php

@@ -33,6 +33,7 @@
 $fieldsetsInLinks = ['linka', 'linkb', 'linkc'];
 $this->ignore_fieldsets = array_merge(['jmetadata', 'item_associations'], $fieldsetsInImages, $fieldsetsInLinks);
 $this->useCoreUI = true;
+$this->workflow_id = $this->item->workflow_id;
 
 // Create shortcut to parameters.
 $params = clone $this->state->get('params');
@@ -182,3 +183,4 @@
         <?php echo $this->form->renderControlFields(); ?>
     </div>
 </form>
+<?php echo LayoutHelper::render('joomla.workflow.graphmodal', $this); ?>

components/com_content/src/Model/FormModel.php

@@ -177,6 +177,12 @@ public function getItem($itemId = null)
             }
         }
 
+        $workflow_assoc = $this->workflow->getAssociation($value->id);
+
+        if (!empty($workflow_assoc->workflow_id)) {
+            $value->workflow_id = $workflow_assoc->workflow_id;
+        }
+
         return $value;
     }
 

components/com_content/tmpl/form/edit.php

@@ -26,6 +26,7 @@
 $this->tab_name = 'com-content-form';
 $this->ignore_fieldsets = ['image-intro', 'image-full', 'jmetadata', 'item_associations'];
 $this->useCoreUI = true;
+$this->workflow_id = $this->item->workflow_id;
 
 // Create shortcut to parameters.
 $params = $this->state->get('params');
@@ -105,7 +106,7 @@
                     <div class="w-100">
                         <?php echo $this->form->renderField('transition'); ?>
                     </div>
-                <?php echo LayoutHelper::render('joomla.workflow.workflowgraphbtn', $this); ?>
+                <?php echo LayoutHelper::render('joomla.workflow.workflowgraphbtn', $this->item); ?>
                 </div>
                 <?php echo $this->form->renderField('state'); ?>
                 <?php echo $this->form->renderField('catid'); ?>

layouts/joomla/edit/article_options.php

@@ -45,7 +45,7 @@
     'tags',
     'note',
     'version_note',
-  ];
+];
 
   $hiddenFields = $displayData->get('hidden_fields') ?? [];
 
@@ -88,4 +88,3 @@
       $html[] = '</fieldset>';
 
       echo implode('', $html);
-      echo LayoutHelper::render('joomla.workflow.graphmodal', $displayData);

layouts/joomla/workflow/graphmodal.php

@@ -3,19 +3,15 @@
 
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
 
 $app = Factory::getApplication();
 $wa = $app->getDocument()->getWebAssetManager();
-$registry = $app->getUserState('registry');
-$wa->getRegistry()->addExtensionRegistryFile('com_workflow');
-// add transitions registry
-$wa->getRegistry()->addExtensionRegistryFile('com_workflow.transitions');
 
+$wa->getRegistry()->addExtensionRegistryFile('com_workflow');
 $wa->useStyle('com_workflow.workflowgraphclient');
 $script = $wa->getAsset('script', name: 'com_workflow.workflowgraphclient')->getUri(true);
 
-$workflowId = $app->getUserState('com_workflow.transitions.filter.workflow_id', 0);
+$workflowId = $displayData->workflow_id;
 ?>
 <template id="workflow-graph-modal-content">