Skip to content

Commit

Permalink
Merge pull request #232 from mzazrivec/use_type_names_from_god_object
Browse files Browse the repository at this point in the history
Use type names directly from GenericObjectDefinition object
  • Loading branch information
abellotti authored Dec 5, 2017
2 parents 33ba2c8 + 050d107 commit 2b07344
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions app/controllers/api/generic_object_definitions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,7 @@ def self.allowed_association_types
end

def self.allowed_types
GenericObjectDefinition::TYPE_MAP.keys.collect do |type|
[Dictionary.gettext(type.to_s, :type => :data_type, :notfound => :titleize, :plural => false), type.to_s]
end.sort
GenericObjectDefinition::TYPE_NAMES.stringify_keys.invert.to_a.sort
end

def options
Expand Down

0 comments on commit 2b07344

Please sign in to comment.