Signed-off-by: Corey Osman <corey@logicminds.biz>
···
---
app/models/config_template.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/app/models/config_template.rb b/app/models/config_template.rb
index ab1e6fd…66f0839 100644
— a/app/models/config_template.rb
+++ b/app/models/config_template.rb
@@ -87,7 +87,7 @@ class ConfigTemplate < ActiveRecord::Base
end
def as_json(options={})
- super({:only => [:name, :template, :snippet]}.merge(options))
- super({:only => [:name, :id, :snippet],:include => [:template_kind]}.merge(options))
end
end
1.7.4.1
Signed-off-by: Corey Osman <corey@logicminds.biz>
···
---
app/models/hostgroup.rb | 2 +-
app/models/operatingsystem.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/models/hostgroup.rb b/app/models/hostgroup.rb
index cf17420…0167ee7 100644
— a/app/models/hostgroup.rb
+++ b/app/models/hostgroup.rb
@@ -55,7 +55,7 @@ class Hostgroup < ActiveRecord::Base
end
def as_json(options={})
- super({:only => [:name, :subnet_id, :domain_id, :id], :methods => [:label, :classes, :parameters].concat(Vm::PROPERTIES), :include => [:environment]}.merge(options))
- super({:only => [:name, :subnet_id, :operatingsystem_id, :domain_id, :id], :methods => [:label, :classes, :parameters].concat(Vm::PROPERTIES), :include => [:environment]}.merge(options))
end
def hostgroup
diff --git a/app/models/operatingsystem.rb b/app/models/operatingsystem.rb
index ee95c02…957796e 100644
— a/app/models/operatingsystem.rb
+++ b/app/models/operatingsystem.rb
@@ -115,7 +115,7 @@ class Operatingsystem < ActiveRecord::Base
end
def as_json(options={})
- {:operatingsystem => {:name => to_s, :id => id, :media => media, :architectures => architectures, :ptables => ptables}}
- {:operatingsystem => {:name => to_s, :id => id, :media => media, :architectures => architectures, :ptables => ptables, :config_templates => config_templates}}
end
def kernel arch
1.7.4.1