Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/components/versions/row_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def wiki_page
end

def button_links
[edit_link, delete_link, backlogs_edit_link].compact
[edit_link, delete_link].compact
end

private
Expand Down
53 changes: 0 additions & 53 deletions app/forms/versions/form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -110,29 +110,6 @@ class Form < ApplicationForm
end
end

if backlogs_enabled?
setting = version_setting_for_project

f.select_list(
name: "version[version_settings_attributes][][display]",
scope_name_to_model: false,
label: I18n.t(:label_column_in_backlog),
input_width: :small
) do |list|
position_display_options.each do |label, value|
list.option(label:, value:, selected: setting.display == value)
end
end

if setting.persisted?
f.hidden(
name: "version[version_settings_attributes][][id]",
value: setting.id,
scope_name_to_model: false
)
end
end

f.hidden(
name: "project_id",
value: project.id,
Expand Down Expand Up @@ -177,35 +154,5 @@ def custom_fields
def wiki_pages_disabled?
contract.assignable_wiki_pages.none?
end

def backlogs_enabled?
resolved_project.backlogs_enabled? && !OpenProject::FeatureDecisions.scrum_projects_active?
end

def resolved_project
@project || version.project
end

def version_setting_for_project
setting = version.version_settings.detect { |vs| vs.project_id == resolved_project.id || vs.project_id.nil? }
setting || version.version_settings.new(display: VersionSetting::DISPLAY_LEFT, project: resolved_project)
end

def position_display_options
[VersionSetting::DISPLAY_NONE,
VersionSetting::DISPLAY_LEFT,
VersionSetting::DISPLAY_RIGHT].map { |s| [humanize_display_option(s), s] }
end

def humanize_display_option(option)
case option
when VersionSetting::DISPLAY_NONE
I18n.t("version_settings_display_option_none")
when VersionSetting::DISPLAY_LEFT
I18n.t("version_settings_display_option_left")
when VersionSetting::DISPLAY_RIGHT
I18n.t("version_settings_display_option_right")
end
end
end
end
6 changes: 1 addition & 5 deletions app/models/permitted_params.rb
Original file line number Diff line number Diff line change
Expand Up @@ -359,18 +359,14 @@ def category
end

def version
# `version_settings_attributes` is from a plugin. Unfortunately as it stands
# now it is less work to do it this way than have the plugin override this
# method. We hopefully will change this in the future.
permitted_params = params.fetch(:version, {}).permit(:name,
:description,
:effective_date,
:due_date,
:start_date,
:wiki_page_title,
:status,
:sharing,
version_settings_attributes: %i(id display project_id))
:sharing)

permitted_params.merge(custom_field_values(:version, required: false))
end
Expand Down
5 changes: 0 additions & 5 deletions config/initializers/feature_decisions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,6 @@
description: "Enables Jira Migration Tool.",
force_active: false

OpenProject::FeatureDecisions.add :scrum_projects,
description: "Enables an overhauled version of the backlogs module to " \
"support Scrum projects with a new sprint planning experience. ",
force_active: true

OpenProject::FeatureDecisions.add :user_working_times,
description: "Enables tracking of user working hours and non-working days."

Expand Down
2 changes: 1 addition & 1 deletion config/locales/js-en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ en:
sprints: "On the right you have the product backlog and the bug backlog, on the left you have the respective sprints. Here you can create <b>epics, user stories, and bugs</b>, prioritize via drag & drop and add them to a sprint."
task_board_arrow: "To see your <b>task board</b>, open the sprint drop-down..."
task_board_select: "...and select the <b>task board</b> entry."
task_board: "The task board visualizes the <b>progress for this sprint</b>. Click on the plus (+) icon next to a user story to add new tasks or impediments. <br> The status can be updated by drag and drop."
task_board: "The sprint board shows the <b>board linked to this sprint</b>, so you can follow the sprint's progress there."
boards:
overview: "Select <b>boards</b> to shift the view and manage your project using the agile boards view."
lists_kanban: "Here you can create multiple lists (columns) within your board. This feature allows you to create a <b>Kanban board</b>, for example."
Expand Down
37 changes: 6 additions & 31 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
"@stimulus-components/auto-submit": "^6.0.0",
"@stimulus-components/reveal": "^5.0.0",
"@tiptap/extensions": "^3.20.0",
"@types/jquery.cookie": "^1.4.36",
"@uirouter/angular": "^17.0.0",
"@uirouter/core": "^6.1.0",
"@uirouter/rx": "^1.0.0",
Expand All @@ -148,7 +147,6 @@
"idiomorph": "^0.7.4",
"jquery": "^3.7.1",
"jquery.caret": "^0.3.1",
"jquery.cookie": "^1.4.1",
"json5": "^2.2.2",
"lit-html": "^3.3.2",
"lodash": "^4.17.23",
Expand Down
9 changes: 0 additions & 9 deletions frontend/src/assets/sass/backlogs/_dialogues.sass

This file was deleted.

66 changes: 0 additions & 66 deletions frontend/src/assets/sass/backlogs/_global.css

This file was deleted.

39 changes: 0 additions & 39 deletions frontend/src/assets/sass/backlogs/_global_print.css

This file was deleted.

6 changes: 0 additions & 6 deletions frontend/src/assets/sass/backlogs/_index.sass
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,4 @@
@import "../../../global_styles/openproject/_variables.sass"
@import "../../../global_styles/openproject/_mixins.sass"

@import global
@import global_print
@import jqplot
@import statistics
@import master_backlog
@import taskboard
@import dialogues
Loading
Loading