foreman_users 0.0.4 → 0.0.5

data/app/controllers/foreman_users/users_controller.rb

@@ -26,8 +26,7 @@ module ForemanUsers
     # GET /foreman_users/new.json
     def new
       @user = foreman_user.new
-      5.times { @user.sygroups.build}
-      #sygroups = @user.sygroups.new
+      5.times { @user.groups.build}
       respond_to do |format|
         format.html # new.html.erb
         format.json { render json: @user }
@@ -37,11 +36,11 @@ module ForemanUsers
     # GET /foreman_users/1/edit
     def edit
       @user = foreman_user.find(params[:id])
-      sygroup_time = @user.sygroups.size
-      if  sygroup_time == 0 
-        5.times { @user.sygroups.build}
+      group_time = @user.groups.size
+      if  group_time == 0 
+        5.times { @user.groups.build}
       else
-        5.times { @user.sygroups.build}
+        5.times { @user.groups.build}
       end
     end
 

data/app/helpers/users_helper.rb

@@ -1,4 +1,4 @@
-module ForemanHosts
+module ForemanUsers
   module UsersHelper
   end
 end

data/app/models/group.rb

@@ -1,5 +1,5 @@
 module ForemanUsers
-  class Sygroup < ActiveRecord::Base
+  class Group < ActiveRecord::Base
     attr_accessible :name, :ensure, :gid, :groupable_type, :groupable_id, :user_id
      belongs_to :user, class_name: "ForemanUsers::User"
   end

data/app/models/user.rb

@@ -1,7 +1,7 @@
 module ForemanUsers
-	class Syuser < ActiveRecord::Base
+	class User < ActiveRecord::Base
 		require "fileutils"
-		attr_accessible :title, :body,  :name, :ensure , :gid, :groups, :home , :password, :password_max_age, :password_min_age, :shell, :uid, :sygroups_attributes
+		attr_accessible :title, :body,  :name, :ensure , :gid, :groups, :home , :password, :password_max_age, :password_min_age, :shell, :uid, :groups_attributes
 
 
 	  has_many :groups, :class_name => 'ForemanTasks::Group', :foreign_key => :user_id
@@ -55,9 +55,9 @@ module ForemanUsers
 		  		user_content = "class users {" + "\n" + "\s\s" + "user { '" + self.name + "':" + "\n\s\s\s\s" + "ensure => '" + self.ensure + "'," + "\n\s\s\s\s" + "gid => '" + self.gid + "'," + "\n\s\s\s\s" + "groups => [" + self.groups + "]," + "\n\s\s\s\s" + "home => '" + self.home + "'," + "\n\s\s\s\s" + "password => '" + self.password + "'," + "\n\s\s\s\s" + "password_max_age => '" + self.password_max_age + "'," + "\n\s\s\s\s" + "password_min_age => '" + self.password_min_age + "'," + "\n\s\s\s\s" + "shell => '" + self.shell + "'," + "\n\s\s\s\s" + "uid => '" + self.uid + "'," + "\n\s\s" +"}" + "\n"
 
 		  		group_content =  "\s\s"
-		  		if self.sygroups.size > 0
-		  			self.sygroups.each do |sygroup|
-		  				group_content +=  "group  {'"+ sygroup.name + "':" + "\n\s\s\s\s" + "ensure => '" + sygroup.ensure + "'," + "\n\s\s\s\s" + "gid => '" + sygroup.gid + "',"  + "\n\s\s" +"}" + "\n\s\s" 
+		  		if self.groups.size > 0
+		  			self.groups.each do |group|
+		  				group_content +=  "group  {'"+ group.name + "':" + "\n\s\s\s\s" + "ensure => '" + group.ensure + "'," + "\n\s\s\s\s" + "gid => '" + group.gid + "',"  + "\n\s\s" +"}" + "\n\s\s" 
 	 	  			end
 		  		end
 		  		rs = user_content + group_content + "\n" + "}"

data/app/views/foreman_users/users/_form.html.erb

@@ -65,17 +65,17 @@
         <div class="row">
           <label class=" col-md-4">name</label><label class=" col-md-4">ensure</label><label class=" col-md-4">gid</label>
         </div>
-        <%= f.fields_for :sygroups do |sygroups_form| %>
+        <%= f.fields_for :groups do |groups_form| %>
 
           <div class="row">
             <div class=" form-group col-md-4">
-              <%= sygroups_form.text_field :name, :size => "col-md-4", placeholder: "填写shell,例如: /bin/bash" ,  class: "form-control"%>
+              <%= groups_form.text_field :name, :size => "col-md-4", placeholder: "填写shell,例如: /bin/bash" ,  class: "form-control"%>
             </div>
             <div class=" form-group col-md-4">
-              <%= sygroups_form.text_field :ensure, :size => "col-md-4", placeholder: "填写shell,例如: /bin/bash" ,  class: "form-control"%>
+              <%= groups_form.text_field :ensure, :size => "col-md-4", placeholder: "填写shell,例如: /bin/bash" ,  class: "form-control"%>
             </div>
             <div class=" form-group col-md-4">
-              <%= sygroups_form.text_field :gid, :size => "col-md-4", placeholder: "填写shell,例如: /bin/bash" ,  class: "form-control"%>
+              <%= groups_form.text_field :gid, :size => "col-md-4", placeholder: "填写shell,例如: /bin/bash" ,  class: "form-control"%>
             </div> 
           </div>
 

data/app/views/foreman_users/users/show.html.erb

@@ -63,11 +63,11 @@
 				<th>gid</th>
 		</thead>
 			<tbody>
-				<% @user.sygroups.each do |sygroup|%>
+				<% @user.groups.each do |group|%>
 					<tr class="success">
-						<td><%= sygroup.name %></td>
-						<td><%= sygroup.ensure %></td>
-						<td><%= sygroup.gid %></td>
+						<td><%= group.name %></td>
+						<td><%= group.ensure %></td>
+						<td><%= group.gid %></td>
 					</tr>
 				<% end %>
 			</tbody>

data/lib/foreman_users/version.rb

@@ -1,3 +1,3 @@
 module ForemanUsers
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_users
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: