Fix model_name method fatten namespace

3 files changed, 9 insertions, 0 deletions

diff --git a/app/models/api/v1/api_key.rb b/app/models/api/v1/api_key.rb
index e1cc2cc3b..767e65f3a 100644
--- a/app/models/api/v1/api_key.rb
+++ b/app/models/api/v1/api_key.rb
@@ -19,6 +19,10 @@ module Api
           end
         end
 
+        def model_name
+          ActiveModel::Name.new self, Api::V1, self.name.demodulize
+        end
+
         def organisation_from_token(token)
           array = token.split('-')
           if !array[1].empty? && array.size > 1
diff --git a/app/models/organisation.rb b/app/models/organisation.rb
index f697122aa..895ca03d9 100644
--- a/app/models/organisation.rb
+++ b/app/models/organisation.rb
@@ -13,6 +13,7 @@ class Organisation < ActiveRecord::Base
 
   has_many :workbenches
   has_many :calendars
+  has_many :api_keys, class_name: 'Api::V1::ApiKey'
 
   validates_presence_of :name
   validates_uniqueness_of :code
diff --git a/spec/decorators/api_key_decorator_spec.rb b/spec/decorators/api_key_decorator_spec.rb
new file mode 100644
index 000000000..9451a3974
--- /dev/null
+++ b/spec/decorators/api_key_decorator_spec.rb
@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe ApiKeyDecorator do
+end