diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index ff7a212ee..923d3f69c 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -627,6 +627,15 @@
}
}
+.milestone-status {
+ background: $budget;
+ border-radius: rem-calc(4);
+ color: #fff;
+ display: inline-block;
+ margin-top: $line-height / 6;
+ padding: $line-height / 4 $line-height / 2;
+}
+
.show-actions-menu {
[class^="icon-"] {
diff --git a/app/views/admin/budget_investment_milestones/_form.html.erb b/app/views/admin/budget_investment_milestones/_form.html.erb
index 3d63477a6..4e7017d75 100644
--- a/app/views/admin/budget_investment_milestones/_form.html.erb
+++ b/app/views/admin/budget_investment_milestones/_form.html.erb
@@ -5,17 +5,13 @@
<%= f.hidden_field :title, value: l(Time.current, format: :datetime),
maxlength: Budget::Investment::Milestone.title_max_length %>
-
-
- <%= f.select :status_id,
- @statuses.collect { |s| [s.name, s.id] },
- { include_blank: @statuses.any? ? '' : t('admin.milestones.form.no_statuses_defined') },
- { disabled: @statuses.blank? } %>
-
-
- <%= link_to t('admin.milestones.form.admin_statuses'),
- admin_budget_investment_statuses_path %>
-
+
+ <%= f.select :status_id,
+ @statuses.collect { |s| [s.name, s.id] },
+ { include_blank: @statuses.any? ? '' : t('admin.milestones.form.no_statuses_defined') },
+ { disabled: @statuses.blank? } %>
+ <%= link_to t('admin.milestones.form.admin_statuses'),
+ admin_budget_investment_statuses_path %>
<%= f.label :description, t("admin.milestones.new.description") %>
diff --git a/app/views/budgets/investments/milestones/_milestone.html.erb b/app/views/budgets/investments/milestones/_milestone.html.erb
index 774819d0c..79c8c05a0 100644
--- a/app/views/budgets/investments/milestones/_milestone.html.erb
+++ b/app/views/budgets/investments/milestones/_milestone.html.erb
@@ -10,6 +10,18 @@
<% end %>
+ <% if milestone.status.present? %>
+
+
+ <%= t("budgets.investments.show.milestone_status_changed") %>
+
+
+
+ <%= milestone.status.name %>
+
+
+ <% end %>
+
<%= image_tag(milestone.image_url(:large), { id: "image_#{milestone.id}", alt: milestone.image.title, class: "margin" }) if milestone.image.present? %>
<% globalize(neutral_locale(locale)) do %>
diff --git a/spec/features/admin/budget_investment_milestones_spec.rb b/spec/features/admin/budget_investment_milestones_spec.rb
index 0c85d09f0..a4272432d 100644
--- a/spec/features/admin/budget_investment_milestones_spec.rb
+++ b/spec/features/admin/budget_investment_milestones_spec.rb
@@ -42,7 +42,7 @@ feature 'Admin budget investment milestones' do
click_link 'Create new milestone'
select status.name, from: 'budget_investment_milestone_status_id'
- fill_in 'budget_investment_milestone_description', with: 'New description milestone'
+ fill_in 'budget_investment_milestone_description_en', with: 'New description milestone'
fill_in 'budget_investment_milestone_publication_date', with: Date.current
click_button 'Create milestone'