Project

General

Profile

« Previous | Next » 

Revision 30ef8b6f

Added by Shlomi Zadok over 8 years ago

Fixes #12004, #11999 - Remove reserved words from Environment friendly_id

Restores use of friendly_id, but removes 'new', 'edit' etc from the
reserved words list to ensure they can be used as identifiers.

Reverts the id-name parameterization to purely name, which fixes
related bugs that caused the parameter value to be used as a Puppet
environment name in class imports, rather than the resource name.

(cherry picked from commit eb8d0ff5fc76002f568bbb94eced10ca6b8b36a9)

View differences:

app/models/environment.rb
class Environment < ActiveRecord::Base
extend FriendlyId
friendly_id :name, :reserved_words => []
include Taxonomix
include Authorizable
include Parameterizable::ByIdName
include Parameterizable::ByName
validates_lengths_from_database
before_destroy EnsureNotUsedBy.new(:hosts, :hostgroups)

Also available in: Unified diff