diff --git a/app/models/project.rb b/app/models/project.rb index b92d10a2d..5c832144a 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -86,7 +86,9 @@ class Project < ApplicationRecord validates_format_of :identifier, :with => /\A(?!\d+$)[a-z0-9\-_]*\z/, :if => proc {|p| p.identifier_changed?} # reserved words - validates_exclusion_of :identifier, :in => %w(new) + validates_exclusion_of :identifier, + :in => %w(new autocomplete bulk_destroy), + :if => -> { new_record? || will_save_change_to_identifier? } validate :validate_parent after_update :update_versions_from_hierarchy_change, diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb index f8b7e64ed..7a9cf7dc6 100644 --- a/test/unit/project_test.rb +++ b/test/unit/project_test.rb @@ -96,6 +96,8 @@ class ProjectTest < ActiveSupport::TestCase "ab-12" => true, "ab_12" => true, "12" => false, + "autocomplete" => false, + 'bulk_destroy' => false, "new" => false} to_test.each do |identifier, valid|