foreman_users 0.0.18.3 → 0.0.18.4

data/app/controllers/foreman_users/users_controller.rb

@@ -1,5 +1,4 @@
-module ForemanUsers
-  class UsersController < ApplicationController
+  class ForemanUsers::UsersController < ApplicationController
     # GET /foreman_users
     # GET /foreman_users.json
     def index
@@ -26,7 +25,7 @@ module ForemanUsers
     # GET /foreman_users/new.json
     def new
       @foreman_users_user = ForemanUsers::User.new
-      5.times { @foreman_users_user.groups.build}
+      5.times { @foreman_users_user.foreman_users_groups.build}
       respond_to do |format|
         format.html # new.html.erb
         format.json { render json: @foreman_users_user }
@@ -36,11 +35,11 @@ module ForemanUsers
     # GET /foreman_users/1/edit
     def edit
       @foreman_users_user = ForemanUsers::User.find(params[:id])
-      group_time = @foreman_users_user.groups.size
+      group_time = @foreman_users_user.foreman_users_groups.size
       if  group_time == 0 
-        5.times { @foreman_users_user.groups.build}
+        5.times { @foreman_users_user.foreman_users_groups.build}
       else
-        5.times { @foreman_users_user.groups.build}
+        5.times { @foreman_users_user.foreman_users_groups.build}
       end
     end
 
@@ -89,5 +88,4 @@ module ForemanUsers
 
 
     end
-  end
-end
+  end

data/app/models/foreman_users/group.rb

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

data/app/models/foreman_users/user.rb

@@ -1,11 +1,10 @@
 require "fileutils"
-module ForemanUsers
-	class User < ActiveRecord::Base
+	class ForemanUsers::User < ActiveRecord::Base
 
 		attr_accessible :title, :body, :username, :ensure , :gid, :groups, :home , :password, :password_max_age, :password_min_age, :shell, :uid, :groups_attributes
 
 
-	  has_many :groups, :class_name => 'ForemanUsers::ForemanUsers::Group', :foreign_key => :user_id
+	  has_many :foreman_users_groups, :class_name => 'ForemanUsers::ForemanUsers::Group', :foreign_key => :user_id
 		accepts_nested_attributes_for :groups, reject_if: proc { |attributes| attributes['gid'].blank?| attributes['name'].blank? | attributes['ensure'].blank?  }  , allow_destroy: true
 
 		after_create :create_dir
@@ -64,5 +63,4 @@ module ForemanUsers
 		  		rs = user_content + group_content + "\n" + "}"
 		  		return rs
 		  	end
-	end
-end
+	end

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

@@ -65,7 +65,7 @@
         <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 :groups do |groups_form| %>
+        <%= f.fields_for :foreman_users_groups do |groups_form| %>
 
           <div class="row">
             <div class=" form-group col-md-4">

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

@@ -63,7 +63,7 @@
 				<th>gid</th>
 		</thead>
 			<tbody>
-				<% @foreman_users_user.groups.each do |group|%>
+				<% @foreman_users_user.foreman_users_groups.each do |group|%>
 					<tr class="success">
 						<td><%= group.groupname %></td>
 						<td><%= group.ensure %></td>

data/lib/foreman_users/version.rb

@@ -1,3 +1,3 @@
 module ForemanUsers
-  VERSION = '0.0.18.3'
+  VERSION = '0.0.18.4'
 end

metadata

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