lib/jss/api_object/group.rb in ruby-jss-0.10.2a5 vs lib/jss/api_object/group.rb in ruby-jss-0.10.2

@@ -65,23 +65,19 @@
     ### Mix-Ins
     #####################################
     include JSS::Creatable
     include JSS::Updatable
     include JSS::Criteriable
-    include JSS::Sitable
 
 
     #####################################
     ### Class Constants
     #####################################
 
     ### the types of groups allowed for creation
     GROUP_TYPES = [:smart, :static]
 
-    # Where is the Site data in the API JSON?
-    SITE_SUBSET = :top
-
     #####################################
     ### Class Variables
     #####################################
 
     #####################################
@@ -359,17 +355,16 @@
     ###
     def rest_xml
       doc = REXML::Document.new JSS::APIConnection::XML_HEADER
       group = doc.add_element self.class::RSRC_OBJECT_KEY.to_s
       group.add_element('name').text = @name
+      group.add_element('site').add_element('name').text = @site if @site
       group.add_element('is_smart').text = @is_smart
       if @is_smart
         group << @criteria.rest_xml if @criteria
       else
         group << self.class::MEMBER_CLASS.xml_list(@members, :id)
       end
-
-      add_site_to_xml(doc)
 
       return doc.to_s
 
     end #rest_xml