Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/13.1' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverguenther committed Dec 13, 2023
2 parents 36f1b19 + 1471070 commit dc7e31e
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 6 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ on:
push:
tags:
- v*
workflow_dispatch:
inputs:
version:
description: "The version to release. Note that this happens by default on the tag push. Only run this action when something went wrong!"
required: true

permissions:
contents: read # to fetch code (actions/checkout)
Expand Down Expand Up @@ -77,6 +82,7 @@ jobs:
--name openproject \
-d -p 8080:80 --platform ${{ matrix.platform }} \
-e SUPERVISORD_LOG_LEVEL=debug \
-e OPENPROJECT_LOGIN__REQUIRED=false \
-e OPENPROJECT_HTTPS=false \
${{ fromJSON(steps.meta.outputs.json).tags[0] }}
Expand Down
4 changes: 2 additions & 2 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,8 @@ en:
sharing:
missing_workflow_waring:
title: "Workflow missing for work package sharing"
message: "No workflow configured for the 'Work package editor' role. Without a workflow, the status of a shared work package cannot be changed."
link_message: "Configure a workflow in the administration."
message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role."
link_message: "Configure the workflows in the administration."

summary:
reports:
Expand Down
7 changes: 7 additions & 0 deletions docs/release-notes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ Stay up to date and get an overview of the new features included in the releases
<!--- New release notes are generated below. Do not remove comment. -->
<!--- RELEASE MARKER -->

## 13.1.0

Release date: 2023-12-13

[Release Notes](13-1-0/)


## 13.0.8

Release date: 2023-12-05
Expand Down
14 changes: 14 additions & 0 deletions docs/user-guide/work-packages/share-work-packages/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,17 @@ If you want to see all shared work packages within a specific project, navigate
You (with the correct permissions) can always change or remove sharing options.

![Filter for work packages shared with other users in OpenProject](openproject_user_guide_shared_with_users_filter.png)

## Configuration

Users with the edit role can update most of the attributes of a shared work package (e.g. 'Subject' and 'Description') and this includes the status. A change in status is governed by the workflows configured for the role the user has. An administrator will therefore have to setup the necessary workflows once. A message at the bottom of the screen will notify administrators of this:

![Message on unconfigured work package editor workflows](openproject_user_guide_sharing_configuration_message.png)

To do so, an administrator can follow the link in the message to get to the form for copying workflows. In that form, select the source type (e.g. 'Task') and source role (e.g. 'Member') to copy the workflow from. Afterwards, select the target (e.g. 'Task') and lastly the role which will be 'Work package editor' to copy the workflow for:

![Example for copying a workflow](openproject_user_guide_sharing_configuration_example.png)

You can also choose to use the workflows for the source type and role as the blueprint for multiple target types at the same time.

The copy of a workflow can later on be altered to better reflect the desired transitions between statuses for the edit role. You can also create the desired workflows from scratch.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/open_project/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module OpenProject
module VERSION # :nodoc:
MAJOR = 13
MINOR = 1
PATCH = 0
PATCH = 1

class << self
# Used by semver to define the special version (if any).
Expand Down
6 changes: 3 additions & 3 deletions spec/features/workflows/missing_for_sharing_wp_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
# There is a warning bar at the bottom informing of the missing workflow
within '.warning-bar--item' do
expect(page)
.to have_content("No workflow configured for the '#{work_package_role.name}' role. " \
"Without a workflow, the status of a shared work package cannot be changed.")
.to have_content("No workflow is configured for the '#{work_package_role.name}' role. " \
"Without a workflow, the shared with user cannot alter the status of the work package.")

click_link "Configure a workflow"
click_link "Configure the workflows in the administration."
end

# On the copy workflow form, select the already existing workflow for copying
Expand Down

0 comments on commit dc7e31e

Please sign in to comment.