OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
encorporate dombesz proposals
ulferts52053c697146
diff --git a/app/components/admin/enumerations/item_form.rb b/app/components/admin/enumerations/item_form.rbindex d85507eb470..47ed6c87448 100644--- a/app/components/admin/enumerations/item_form.rb+++ b/app/components/admin/enumerations/item_form.rb@@ -53,8 +53,8 @@ module Adminform.check_box(name: :active,label: object.class.human_attribute_name(:active),- data: { action: "admin--enumerations#lockstepDefault",- "admin--enumerations-target": "active" }+ disabled: object.is_default,+ data: { "admin--enumerations-target": "active" })if object.class.can_have_default_value?diff --git a/app/models/enumeration.rb b/app/models/enumeration.rbindex dda4edc2a39..1f25fa8f186 100644--- a/app/models/enumeration.rb+++ b/app/models/enumeration.rb@@ -37,6 +37,7 @@ class Enumeration < ApplicationRecordacts_as_tree order: "position ASC"before_save :unmark_old_default_value, if: :became_default_value?+ before_save :ensure_activated, if: -> { self.class.can_have_default_value? && is_default? }before_destroy :check_integrityvalidates :name, presence: true@@ -44,7 +45,6 @@ class Enumeration < ApplicationRecorduniqueness: { scope: %i(type project_id),case_sensitive: false }validates :name, length: { maximum: 256 }- validate :default_is_active, if: -> { self.class.can_have_default_value? }scope :shared, -> { where(project_id: nil) }scope :active, -> { where(active: true) }@@ -175,9 +175,7 @@ class Enumeration < ApplicationRecordraise "Can't delete enumeration" if in_use?end- def default_is_active- if is_default? && !active?- errors.add(:is_default, :active_required)- end+ def ensure_activated+ self.active = trueendenddiff --git a/config/locales/en.yml b/config/locales/en.ymlindex b3b5c6b2577..85b39faac3d 100644--- a/config/locales/en.yml+++ b/config/locales/en.yml@@ -1463,10 +1463,6 @@ en:only_one_trial: "Only one trial token can be active. Please delete the previous trial token before adding another."unreadable: "can't be read. Are you sure it is a support token?"already_added: "This token has already been added."- enumeration:- attributes:- active:- active_required: "needs the 'Active' property to be true."grids/grid:overlaps: "overlap."outside: "is outside of the grid."diff --git a/frontend/src/stimulus/controllers/dynamic/admin/enumerations.controller.ts b/frontend/src/stimulus/controllers/dynamic/admin/enumerations.controller.tsindex e996ebf878e..b30dbc1cd3e 100644--- a/frontend/src/stimulus/controllers/dynamic/admin/enumerations.controller.ts+++ b/frontend/src/stimulus/controllers/dynamic/admin/enumerations.controller.ts@@ -44,12 +44,9 @@ export default class EnumerationsController extends Controller {public lockstepActive() {if (this.defaultTarget.checked) {this.activeTarget.checked = true;- }- }-- public lockstepDefault() {- if (!this.activeTarget.checked && this.hasDefaultTarget) {- this.defaultTarget.checked = false;+ this.activeTarget.disabled = true;+ } else {+ this.activeTarget.disabled = false;}}}diff --git a/modules/costs/spec/models/time_entry_activity_spec.rb b/modules/costs/spec/models/time_entry_activity_spec.rbindex 57e8010df1a..4ff2642feb8 100644--- a/modules/costs/spec/models/time_entry_activity_spec.rb+++ b/modules/costs/spec/models/time_entry_activity_spec.rb@@ -55,7 +55,7 @@ RSpec.describe TimeEntryActivity doendend- it_behaves_like "enumeration validation", false do- let(:enumeration) { build_stubbed(:time_entry_activity) }+ it_behaves_like "enumeration#active handling", false do+ let(:enumeration) { described_class.new(attributes_for(:time_entry_activity)) }endenddiff --git a/modules/documents/spec/models/document_category_spec.rb b/modules/documents/spec/models/document_category_spec.rbindex bedf1cb7e2b..16bbbd09cf8 100644--- a/modules/documents/spec/models/document_category_spec.rb+++ b/modules/documents/spec/models/document_category_spec.rb@@ -61,7 +61,7 @@ RSpec.describe DocumentCategory doend.to change { old_default.is_default? }.from(true).to(false)end- it_behaves_like "enumeration validation", true do- let(:enumeration) { build_stubbed(:document_category) }+ it_behaves_like "enumeration#active handling", true do+ let(:enumeration) { described_class.new(attributes_for(:document_category)) }endenddiff --git a/spec/models/enumerations/shared_enumeration_examples.rb b/spec/models/enumerations/shared_enumeration_examples.rbindex 28c9bb0b670..08eb15509f4 100644--- a/spec/models/enumerations/shared_enumeration_examples.rb+++ b/spec/models/enumerations/shared_enumeration_examples.rb@@ -30,22 +30,37 @@require "spec_helper"-RSpec.shared_context "enumeration validation" do |default_supported| # rubocop:disable RSpec/ContextWording+RSpec.shared_context "enumeration#active handling" do |default_supported| # rubocop:disable RSpec/ContextWordinglet(:enumeration) dosuper()rescue NoMethodErrorraise "'enumeration' let needs to be set"end- describe "#valid?" do+ describe "#active" doif default_supported- context "with the enumeration being inactive and default" do- it "is invalid", :aggregate_failures do+ context "with the enumeration being inactive and default before saving" do+ it "sets the enumeration to be active", :aggregate_failures doenumeration.active = falseenumeration.is_default = true- expect(enumeration.valid?).to be false- expect(enumeration.errors.symbols_for(:is_default)).to contain_exactly(:active_required)+ enumeration.save++ expect(enumeration).to be_persisted+ expect(enumeration.active).to be true+ end+ end++ context "with the enumeration being inactive and not default before saving" do+ it "keeps the value of active", :aggregate_failures do+ enumeration.active = false+ enumeration.is_default = false++ enumeration.save++ expect(enumeration).to be_persisted+ expect(enumeration.active).to be false+ expect(enumeration.is_default).to be falseendendenddiff --git a/spec/models/issue_priority_spec.rb b/spec/models/issue_priority_spec.rbindex 9c00131ae5f..b82cb17a410 100644--- a/spec/models/issue_priority_spec.rb+++ b/spec/models/issue_priority_spec.rb@@ -37,8 +37,8 @@ RSpec.describe IssuePriority dolet(:stubbed_priority) { build_stubbed(:priority) }- it_behaves_like "enumeration validation", true do- let(:enumeration) { build_stubbed(:priority) }+ it_behaves_like "enumeration#active handling", true do+ let(:enumeration) { described_class.new(attributes_for(:priority)) }enddescribe ".ancestors" do