Changed Unit uniqueness condtions to shortname only

app/controllers/units_controller.rb

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

app/models/unit.rb

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

config/locales/en.yml

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