From 2ed0c67570dd8a1588371bbe903774c2d7306907 Mon Sep 17 00:00:00 2001 From: et Date: Mon, 12 Jul 2010 16:37:00 -0400 Subject: [PATCH] Adding default version. --- app/models/project.rb | 2 ++ app/views/issues/_attributes.rhtml | 2 +- app/views/projects/_form.rhtml | 5 +++++ config/locales/en.yml | 1 + db/migrate/109_add_default_version_to_project.rb | 9 +++++++++ 5 files changed, 18 insertions(+), 1 deletions(-) create mode 100644 db/migrate/109_add_default_version_to_project.rb diff --git a/app/models/project.rb b/app/models/project.rb index 8d63032..fb33684 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -20,6 +20,8 @@ class Project < ActiveRecord::Base STATUS_ACTIVE = 1 STATUS_ARCHIVED = 9 + belongs_to :default_version, :class_name => 'Version', :foreign_key => 'default_version_id' + # Specific overidden Activities has_many :time_entry_activities has_many :members, :include => [:user, :roles], :conditions => "#{User.table_name}.type='User' AND #{User.table_name}.status=#{User::STATUS_ACTIVE}" diff --git a/app/views/issues/_attributes.rhtml b/app/views/issues/_attributes.rhtml index 455eb77..5dc401a 100644 --- a/app/views/issues/_attributes.rhtml +++ b/app/views/issues/_attributes.rhtml @@ -19,7 +19,7 @@ :tabindex => 199) if authorize_for('issue_categories', 'new') %>

<% end %> <% unless @issue.assignable_versions.empty? %> -

<%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true %> +

<%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version ||= @project.default_version), :include_blank => true %> <%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'), l(:label_version_new), 'version[name]', diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml index 30848e4..246684e 100644 --- a/app/views/projects/_form.rhtml +++ b/app/views/projects/_form.rhtml @@ -15,6 +15,11 @@ <% end %>

<%= f.text_field :homepage, :size => 60 %>

<%= f.check_box :is_public %>

+ +<% if Project.exists?(@project) && !@project.shared_versions.empty? %> +

<%= f.select :default_version_id, version_options_for_select(@project.shared_versions, @project.default_version), :include_blank => true %>

+<% end %> + <%= wikitoolbar_for 'project_description' %> <% @project.custom_field_values.each do |value| %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 351de3b..314d1dd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -241,6 +241,7 @@ en: field_new_password: New password field_password_confirmation: Confirmation field_version: Version + field_default_version: Default version field_type: Type field_host: Host field_port: Port diff --git a/db/migrate/109_add_default_version_to_project.rb b/db/migrate/109_add_default_version_to_project.rb new file mode 100644 index 0000000..dcf7c36 --- /dev/null +++ b/db/migrate/109_add_default_version_to_project.rb @@ -0,0 +1,9 @@ +class AddDefaultVersionToProject < ActiveRecord::Migration + def self.up + add_column :projects, :default_version_id, :integer, :default => nil + end + + def self.down + remove_column :projects, :default_version_id + end +end -- 1.6.5.2