Skip to content

[4.0] Workflow Transitions/Stages #21592

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

Merged
merged 13 commits into from
Sep 10, 2018
Merged

[4.0] Workflow Transitions/Stages #21592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bfc7770
[4.0] Transitions
brianteeman Aug 13, 2018
0d4dd34
[4.0] Workflow - transitions
brianteeman Aug 13, 2018
ffe7069
Merge branch '4.0-dev' into monday-stage
brianteeman Aug 13, 2018
dbfa778
cs
brianteeman Aug 13, 2018
229bde5
make the note styled consistently with similar fields
brianteeman Aug 13, 2018
702e8c2
use layout for the rigght hand side
brianteeman Aug 13, 2018
51ea31b
display the title
brianteeman Aug 13, 2018
8067c6c
add the same to stages
brianteeman Aug 19, 2018
da5d41c
oops
brianteeman Aug 19, 2018
bb8661b
Merge branch '4.0-dev' into monday-stage
brianteeman Aug 19, 2018
9b323bc
Merge branch '4.0-dev' into monday-stage
brianteeman Sep 7, 2018
18a3f12
Update default.php
brianteeman Sep 7, 2018
948cb87
escape text
brianteeman Sep 7, 2018
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
3 changes: 2 additions & 1 deletion administrator/components/com_workflow/Model/StagesModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@ public function getListQuery()
's.ordering',
's.condition',
's.default',
's.published'
's.published',
's.description'
)
);

Expand Down
13 changes: 7 additions & 6 deletions administrator/components/com_workflow/Model/TransitionsModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,13 @@ public function getListQuery()

$select = $db->quoteName(
array(
't.id',
't.title',
't.from_stage_id',
't.to_stage_id',
't.published',
't.ordering',
't.id',
't.title',
't.from_stage_id',
't.to_stage_id',
't.published',
't.ordering',
't.description',
)
);

Expand Down
17 changes: 7 additions & 10 deletions administrator/components/com_workflow/forms/stage.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<fieldset addfieldprefix="Joomla\Component\Workflow\Administrator\Field">
<fieldset name="stage" addfieldprefix="Joomla\Component\Workflow\Administrator\Field">
<field
name="id"
type="text"
Expand All @@ -14,22 +14,19 @@
name="title"
type="text"
label="COM_WORKFLOW_FIELD_NAME_LABEL"
class="input-xxlarge input-large-text"
size="40"
required="true"
/>
<field
name="description"
type="editor"
label="COM_WORKFLOW_FIELD_DESC_LABEL"
class="input-xxlarge input-large-text"
type="text"
label="COM_WORKFLOW_STAGE_NOTE"
/>
<field
name="condition"
type="workflowcondition"
label="COM_WORKFLOW_CONDITION"
description="COM_WORKFLOW_CONDITION_DESC"
class="input-xxlarge input-large-text"
name="condition"
type="workflowcondition"
label="COM_WORKFLOW_CONDITION"
description="COM_WORKFLOW_CONDITION_DESC"
/>
</fieldset>

Expand Down
10 changes: 4 additions & 6 deletions administrator/components/com_workflow/forms/transition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<fieldset addfieldprefix="Joomla\Component\Workflow\Administrator\Field">
<fieldset name="transition" addfieldprefix="Joomla\Component\Workflow\Administrator\Field">
<field
name="id"
type="text"
type="hidden"
label="JGLOBAL_FIELD_ID_LABEL"
default="0"
class="readonly"
Expand All @@ -14,7 +14,6 @@
name="title"
type="text"
label="COM_WORKFLOW_FIELD_NAME_LABEL"
class="input-xxlarge input-large-text"
size="40"
required="true"
/>
Expand All @@ -40,9 +39,8 @@
/>
<field
name="description"
type="editor"
label="COM_WORKFLOW_FIELD_DESC_LABEL"
class="input-xxlarge input-large-text"
type="text"
label="COM_WORKFLOW_TRANSITION_NOTE"
/>
</fieldset>

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_workflow/tmpl/stage/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<div class="row">
<div class="col-md-9">
<?php echo $this->form->renderField('condition'); ?>
<?php echo $this->form->getInput('description'); ?>
<?php echo $this->form->renderField('description'); ?>
</div>
<div class="col-md-3">
<div class="card card-block card-light">
Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_workflow/tmpl/stages/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,10 @@
<a href="<?php echo $edit; ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes(Text::_($item->title))); ?>">
<?php echo $editIcon; ?><?php echo $this->escape(Text::_($item->title)); ?>
</a>
<div class="small"><?php echo $this->escape(Text::_($item->description)); ?></div>
<?php else: ?>
<?php echo $this->escape(Text::_($item->title)); ?>
<div class="small"><?php echo $this->escape(Text::_($item->description)); ?></div>
<?php endif; ?>
</th>
<td class="text-center">
Expand Down
36 changes: 6 additions & 30 deletions administrator/components/com_workflow/tmpl/transition/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,46 +26,22 @@
?>

<form action="<?php echo Route::_('index.php?option=com_workflow&view=transition&workflow_id=' . $this->workflowID . '&extension=' . $this->input->getCmd('extension') . '&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="workflow-form" class="form-validate">

<?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>

<div>
<?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>

<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', array('active' => 'details')); ?>

<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'details', Text::_('COM_WORKFLOW_DESCRIPTION')); ?>
<div class="row">
<div class="col-md-9">
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('from_stage_id'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('from_stage_id'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('to_stage_id'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('to_stage_id'); ?>
</div>
</div>
<?php echo $this->form->getInput('description'); ?>
<?php echo $this->form->renderField('from_stage_id'); ?>
<?php echo $this->form->renderField('to_stage_id'); ?>
<?php echo $this->form->renderField('description'); ?>
</div>
<div class="col-md-3">
<div class="card card-block card-light">
<div class="card-body">
<fieldset class="form-vertical form-no-margin">
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('published'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('published'); ?>
</div>
</div>
</fieldset>
<?php echo LayoutHelper::render('joomla.edit.global', $this); ?>
</div>
</div>
</div>
Expand Down
6 changes: 4 additions & 2 deletions administrator/components/com_workflow/tmpl/transitions/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,12 @@
<?php if ($canEdit) : ?>
<?php $editIcon = '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
<a href="<?php echo $edit; ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes(Text::_($item->title))); ?>">
<?php echo $editIcon; ?><?php echo $item->title; ?>
<?php echo $editIcon; ?><?php echo $this->escape(Text::_($item->title)); ?>
</a>
<div class="small"><?php echo $this->escape(Text::_($item->description)); ?></div>
<?php else: ?>
<?php echo $item->title; ?>
<?php echo $this->escape(Text::_($item->title)); ?>
<div class="small"><?php echo $this->escape(Text::_($item->description)); ?></div>
<?php endif; ?>
</th>
<td class="text-center">
Expand Down
2 changes: 2 additions & 0 deletions administrator/language/en-GB/en-GB.com_workflow.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ COM_WORKFLOW_STAGES="Stages"
COM_WORKFLOW_STAGES_LIST="%s Stages List"
COM_WORKFLOW_STAGE_ADD="Add Stage"
COM_WORKFLOW_STAGE_EDIT="Edit Stage"
COM_WORKFLOW_STAGE_NOTE="Note"
COM_WORKFLOW_TOOLBAR_DEFAULT="Default"
COM_WORKFLOW_TO_STAGE="To Stage"
COM_WORKFLOW_TO_STAGE_DESC="Select target stage."
Expand All @@ -89,6 +90,7 @@ COM_WORKFLOW_TRANSITIONS_LIST="%s Transitions List"
COM_WORKFLOW_TRANSITION_ADD="Add Transition"
COM_WORKFLOW_TRANSITION_DUPLICATE="This transition already exists."
COM_WORKFLOW_TRANSITION_EDIT="Edit Transition"
COM_WORKFLOW_TRANSITION_NOTE="Note"
COM_WORKFLOW_TRANSITION_THE_SAME_STAGE="Current stage and target stage are the same."
COM_WORKFLOW_TRASHED="Trashed"
COM_WORKFLOW_UNPUBLISH_DEFAULT_ERROR="You can't unpublish the default workflow."
Expand Down