diff --git a/app/views/admin/budget_investment_milestones/_form.html.erb b/app/views/admin/budget_investment_milestones/_form.html.erb
index 6643c7317..3d63477a6 100644
--- a/app/views/admin/budget_investment_milestones/_form.html.erb
+++ b/app/views/admin/budget_investment_milestones/_form.html.erb
@@ -5,6 +5,19 @@
<%= 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.label :description, t("admin.milestones.new.description") %>
<% @milestone.globalize_locales.each do |locale| %>
<%= hidden_field_tag "delete_translations[#{locale}]", 0 %>
diff --git a/app/views/admin/budget_investments/_milestones.html.erb b/app/views/admin/budget_investments/_milestones.html.erb
index 75d4c65a1..757fb97e4 100644
--- a/app/views/admin/budget_investments/_milestones.html.erb
+++ b/app/views/admin/budget_investments/_milestones.html.erb
@@ -6,6 +6,7 @@
<%= t("admin.milestones.index.table_title") %> |
<%= t("admin.milestones.index.table_description") %> |
<%= t("admin.milestones.index.table_publication_date") %> |
+ <%= t("admin.milestones.index.table_status") %> |
<%= t("admin.milestones.index.image") %> |
<%= t("admin.milestones.index.documents") %> |
<%= t("admin.milestones.index.table_actions") %> |
@@ -25,6 +26,9 @@
<%= l(milestone.publication_date.to_date) if milestone.publication_date.present? %>
|
+
+ <%= milestone.status.present? ? milestone.status.name : '' %>
+ |
<%= link_to t("admin.milestones.index.show_image"),
milestone.image_url(:large),
|