Skip to content

Commit

Permalink
Fix versioning strategy values on the UI
Browse files Browse the repository at this point in the history
  • Loading branch information
kitallis committed Dec 2, 2023
1 parent 7772f16 commit 2905982
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions app/models/train.rb
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class Train < ApplicationRecord

validates :branching_strategy, :working_branch, presence: true
validates :branching_strategy, inclusion: {in: BRANCHING_STRATEGIES.keys.map(&:to_s)}
validates :versioning_strategy, presence: true, inclusion: {in: Train.versioning_strategies.values}
validates :release_backmerge_branch, presence: true, if: -> { branching_strategy == "release_backmerge" }
validates :release_branch, presence: true, if: -> { branching_strategy == "parallel_working" }
validate :semver_compatibility, on: :create
Expand Down
2 changes: 1 addition & 1 deletion app/views/trains/_versioning_strategy.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div>
<%= form.label "Strategy", class: "block text-sm font-medium mb-1" %>
<%= form.select :versioning_strategy,
options_for_select(Train.versioning_strategies.invert.transform_values(&:titleize), train.versioning_strategy),
options_for_select(Train.versioning_strategies.transform_values(&:titleize).invert, train.versioning_strategy),
{ required: true, },
{ class: text_field_classes(is_disabled: train.persisted?),
disabled: train.persisted? } %>
Expand Down

0 comments on commit 2905982

Please sign in to comment.