From 39df75be266ed6da453b569c6bf8e8bffe732d06 Mon Sep 17 00:00:00 2001 From: Marius BALTEANU Date: Sat, 1 Sep 2018 09:51:54 +0000 Subject: [PATCH] Add start date to versions --- app/models/version.rb | 8 +++++++- app/views/versions/_form.html.erb | 1 + db/migrate/20180901095034_add_start_date_to_versions.rb | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180901095034_add_start_date_to_versions.rb diff --git a/app/models/version.rb b/app/models/version.rb index 5626750..19db85e 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -151,6 +151,7 @@ class Version < ActiveRecord::Base safe_attributes 'name', 'description', 'effective_date', + 'start_date', 'due_date', 'wiki_page_title', 'status', @@ -181,7 +182,12 @@ class Version < ActiveRecord::Base end def start_date - @start_date ||= fixed_issues.minimum('start_date') + version_start_date = read_attribute('start_date') + if version_start_date.nil? + @start_date = fixed_issues.minimum('start_date') + else + @start_date = version_start_date + end end def due_date diff --git a/app/views/versions/_form.html.erb b/app/views/versions/_form.html.erb index ade741f..778a1bf 100644 --- a/app/views/versions/_form.html.erb +++ b/app/views/versions/_form.html.erb @@ -8,6 +8,7 @@

<%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %>

<% end %>

<%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %>

+

<%= f.date_field :start_date, :size => 10 %><%= calendar_for('version_start_date') %>

<%= f.date_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %>

<%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %>

<% if @version.new_record? %> diff --git a/db/migrate/20180901095034_add_start_date_to_versions.rb b/db/migrate/20180901095034_add_start_date_to_versions.rb new file mode 100644 index 0000000..1e5bc16 --- /dev/null +++ b/db/migrate/20180901095034_add_start_date_to_versions.rb @@ -0,0 +1,5 @@ +class AddStartDateToVersions < ActiveRecord::Migration[5.2] + def change + add_column :versions, :start_date, :date, :after => :description + end +end -- 2.1.4