Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Changed Unit uniqueness condtions to shortname only

Browse Source
This commit is contained in:
cryptogopher 2019-08-22 22:10:51 +02:00
parent b0a02b7474
commit b1be5e571a
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/units_controller.rb
View File

@ -27,9 +27,10 @@ class UnitsController < ApplicationController
end end
def import def import
available = Unit.where(project: @project).pluck(:shortname)
defaults = Unit.where(project: nil).pluck(:name, :shortname) defaults = Unit.where(project: nil).pluck(:name, :shortname)
missing = defaults - Unit.where(project: @project).pluck(:name, :shortname) defaults.delete_if { |n, s| available.include?(s) }
@project.units.create(missing.map { |n, s| {name: n, shortname: s} }) @project.units.create(defaults.map { |n, s| {name: n, shortname: s} })
redirect_to project_units_url(@project) redirect_to project_units_url(@project)
end end

3
app/models/unit.rb
View File

@ -2,5 +2,6 @@ class Unit < ActiveRecord::Base
belongs_to :project belongs_to :project
validates :project, associated: true validates :project, associated: true
validates :name, :shortname, presence: true, uniqueness: true validates :name, presence: true
validates :shortname, presence: true, uniqueness: {scope: :project_id}
end end

2
config/locales/en.yml
View File

@ -15,4 +15,4 @@ en:
index: index:
heading: 'Units' heading: 'Units'
heading_new_unit: 'New unit' heading_new_unit: 'New unit'
heading_import: 'Import' heading_import: 'Import defaults'