foreman_users 0.0.16 → 0.0.17

data/app/models/foreman_users/group.rb

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

data/app/models/foreman_users/user.rb

@@ -1,7 +1,7 @@
 module ForemanUsers
 	class User < ActiveRecord::Base
 		require "fileutils"
-		attr_accessible :title, :body,  :name, :ensure , :gid, :groups, :home , :password, :password_max_age, :password_min_age, :shell, :uid, :groups_attributes
+		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 => 'ForemanTasks::Group', :foreign_key => :user_id

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

@@ -6,7 +6,7 @@
         <div class="row">
           <div class="form-group col-md-6">
                     <label>name</label>
-            <%= f.text_field :name, :size => "col-md-6", placeholder: "填写用户名",  class: "form-control" %>
+            <%= f.text_field :username, :size => "col-md-6", placeholder: "填写用户名",  class: "form-control" %>
           </div>
           <div class="form-group col-md-6">
             <label for="user_ensure">ensure</label> <br />
@@ -69,7 +69,7 @@
 
           <div class="row">
             <div class=" form-group col-md-4">
-              <%= groups_form.text_field :name, :size => "col-md-4", placeholder: "填写shell,例如: /bin/bash" ,  class: "form-control"%>
+              <%= groups_form.text_field :groupname, :size => "col-md-4", placeholder: "填写shell,例如: /bin/bash" ,  class: "form-control"%>
             </div>
             <div class=" form-group col-md-4">
               <%= groups_form.text_field :ensure, :size => "col-md-4", placeholder: "填写shell,例如: /bin/bash" ,  class: "form-control"%>

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

@@ -19,7 +19,7 @@
   <tbody>
     <% users.each do |user| %>
       <tr>
-        <td class=''><%= user.name %></td>
+        <td class=''><%= user.username %></td>
         <td class="hidden-xs"><%=  user.ensure %></td>
         <td class="hidden-xs"><%=  user.gid %></td>
         <td class="hidden-tablet hidden-xs"><%=  user.groups %></td>

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

@@ -2,7 +2,7 @@
   <%= f.fields_for :group do |f| %>
   <div class="row">
     <div class="col-md-4 column form-group">
-        <%= text_f f, :name, :help_inline => _("填写用户名") %>
+        <%= text_f f, :groupname, :help_inline => _("填写用户名") %>
     </div>
     <div class="col-md-4 column form-group">
         <%= text_f f, :name, :help_inline => _("填写用户名") %>

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

@@ -19,7 +19,7 @@
 					<td><strong>groups</strong></td>
 				</tr>
 				<tr>
-					<td><%= @user.name %></td>
+					<td><%= @user.username %></td>
 					<td><%= @user.ensure %></td>
 					<td><%= @user.gid %></td>
 					<td><%= @user.groups %></td>
@@ -65,7 +65,7 @@
 			<tbody>
 				<% @user.groups.each do |group|%>
 					<tr class="success">
-						<td><%= group.name %></td>
+						<td><%= group.groupname %></td>
 						<td><%= group.ensure %></td>
 						<td><%= group.gid %></td>
 					</tr>

data/db/migrate/20150918022911_create_foreman_users_users.rb

@@ -1,17 +1,19 @@
 class CreateForemanUsersUsers < ActiveRecord::Migration
 	def change
+		drop_table :foreman_users_users  if table_exists? :foreman_users_users
+
 		create_table :foreman_users_users do |t|
-			t.string :name #名称
-			t.string :ensure  #下拉菜单
-			t.string :gid #输入框
-			t.string :groups #多选
-			t.string :home  #输入
+			t.string :username
+			t.string :ensure
+			t.string :gid
+			t.string :groups
+			t.string :home
 			t.string :password
 			t.string :password_max_age
 			t.string :password_min_age
 			t.string :shell
 			t.string :uid
 			t.timestamps
-		end
+		end   unless table_exists? :foreman_users_users
 	end
 end

data/db/migrate/20150918050939_create_foreman_users_groups.rb

@@ -1,13 +1,14 @@
 class CreateForemanUsersGroups < ActiveRecord::Migration
   def change
+    drop_table :foreman_users_groups  if table_exists? :foreman_users_groups
     create_table :foreman_users_groups do |t|
-  		t.string :name
+  		t.string :groupname
   		t.string :ensure
   		t.string :gid
   		t.string :groupable_type
   		t.integer :groupable_id
       t.integer :user_id
   		t.timestamps
-    end
+    end   unless table_exists? :foreman_users_groups
   end
 end

data/lib/foreman_users/version.rb

@@ -1,3 +1,3 @@
 module ForemanUsers
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end

metadata

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