Skip to content
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

Workflow rename transition options to actions #79

Merged
merged 4 commits into from
May 1, 2020
Merged

Workflow rename transition options to actions #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97f9a49
Merge branch 'workflow-v3' of https://github.com/bembelimen/joomla-cm…
HLeithner Apr 26, 2020
d0f906c
Merge branch 'workflow-v3' of https://github.com/bembelimen/joomla-cm…
HLeithner May 1, 2020
b5cc4bb
Add codeowners
HLeithner May 1, 2020
64bf8b5
Rename transition tab options to actions
HLeithner May 1, 2020
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
15 changes: 15 additions & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,18 @@ plugins/system/webauthn/* @nikosdion
media/plg_system_webauthn/* @nikosdion
language/administrator/en-GB/en-GB.plg_system_webauthn.ini @nikosdion
language/administrator/en-GB/en-GB.plg_system_webauthn.sys.ini @nikosdion

# Workflow
administrator/components/com_workflow/* @bembelimen @hleithner
administrator/language/en-GB/com_workflow.ini @bembelimen @hleithner
administrator/language/en-GB/com_workflow.sys.ini @bembelimen @hleithner
administrator/language/en-GB/plg_workflow_publishing.ini @bembelimen @hleithner
administrator/language/en-GB/plg_workflow_publishing.sys.ini @bembelimen @hleithner
libraries/src/Form/Field/TransitionField.php @bembelimen @hleithner
libraries/src/Form/Field/Workflow* @bembelimen @hleithner
libraries/src/HTML/Helpers/Workflow* @bembelimen @hleithner
libraries/src/MVC/Model/Workflow* @bembelimen @hleithner
libraries/src/MVC/Model/Workflow* @bembelimen @hleithner
libraries/src/Workflow/* @bembelimen @hleithner
build/media_source/com_workflow/* @bembelimen @hleithner
plugins/workflow/* @bembelimen @hleithner
1 change: 1 addition & 0 deletions administrator/language/en-GB/com_workflow.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ COM_WORKFLOW_TOO_MANY_STAGES="Only one stage can be set as the default."
COM_WORKFLOW_TOO_MANY_WORKFLOWS="Only one workflow can be set as the default."
COM_WORKFLOW_TO_STAGE="Target Stage"
COM_WORKFLOW_TRANSITION="Transition"
COM_WORKFLOW_TRANSITION_ACTIONS_LABEL="Transition Actions"
COM_WORKFLOW_TRANSITIONS="Transitions"
COM_WORKFLOW_TRANSITIONS_LIST="Transitions List: %s"
COM_WORKFLOW_TRANSITIONS_N_ITEMS_CHECKED_IN="%s transitions checked in."
Expand Down
9 changes: 4 additions & 5 deletions administrator/language/en-GB/plg_workflow_publishing.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
; Note : All ini files need to be saved as UTF-8

PLG_WORKFLOW_PUBLISHING="Workflow - Publishing"
PLG_WORKFLOW_PUBLISHING_XML_DESCRIPTION="Add publishing options to the workflow transitions for your items"
PLG_WORKFLOW_PUBLISHING_TRANSITION_OPTIONS_LABEL="Transition Options"
PLG_WORKFLOW_PUBLISHING_TRANSITION_OPTIONS_PUBLISHING_LABEL="Publishing state"
PLG_WORKFLOW_PUBLISHING_TRANSITION_OPTIONS_PUBLISHING_DESC="Define the state an item should be set, when executing this transition"
PLG_WORKFLOW_PUBLISHING_TRANSITION_OPTIONS_PUBLISHING_DO_NO_CHANGE="- Do not change"
PLG_WORKFLOW_PUBLISHING_XML_DESCRIPTION="Add publishing actions to the workflow transitions for your items"
PLG_WORKFLOW_PUBLISHING_TRANSITION_ACTIONS_PUBLISHING_LABEL="Publishing state"
PLG_WORKFLOW_PUBLISHING_TRANSITION_ACTIONS_PUBLISHING_DESC="Define the state an item should be set, when executing this transition"
PLG_WORKFLOW_PUBLISHING_TRANSITION_ACTIONS_PUBLISHING_DO_NO_CHANGE="- Do not change -"
PLG_WORKFLOW_PUBLISHING_CHANGE_STATE_NOT_ALLOWED="You're not allowed to change the publishing state of this item. Please use a workflow transition."
PLG_WORKFLOW_PUBLISHING_PUBLISHED="Status: %s"
10 changes: 5 additions & 5 deletions plugins/workflow/publishing/forms/workflow_publishing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<fields name="options">
<fieldset name="options"
label="PLG_WORKFLOW_PUBLISHING_TRANSITION_OPTIONS_LABEL"
<fieldset name="actions"
label="COM_WORKFLOW_TRANSITION_ACTIONS_LABEL"
>
<field
name="publishing"
type="workflowcondition"
label="PLG_WORKFLOW_PUBLISHING_TRANSITION_OPTIONS_PUBLISHING_LABEL"
description="PLG_WORKFLOW_PUBLISHING_TRANSITION_OPTIONS_PUBLISHING_DESC"
label="PLG_WORKFLOW_PUBLISHING_TRANSITION_ACTIONS_PUBLISHING_LABEL"
description="PLG_WORKFLOW_PUBLISHING_TRANSITION_ACTIONS_PUBLISHING_DESC"
default=""
hide_all="true"
>
<option value="">PLG_WORKFLOW_PUBLISHING_TRANSITION_OPTIONS_PUBLISHING_DO_NO_CHANGE</option>
<option value="">PLG_WORKFLOW_PUBLISHING_TRANSITION_ACTIONS_PUBLISHING_DO_NO_CHANGE</option>
</field>
</fieldset>
</fields>
Expand Down