foreman_users 1.1.4 → 1.2.0

data/app/controllers/foreman_users/sygroups_controller.rb

@@ -0,0 +1,79 @@
+class ForemanUsers::SygroupsController < ApplicationController
+  # GET /sygroups
+  # GET /sygroups.json
+  def index
+    @sygroups = ForemanUsers::Sygroup.all.paginate(:page => params[:page])
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @sygroups }
+    end
+  end
+
+  # GET /sygroups/1
+  # GET /sygroups/1.json
+  def show
+    @sygroup = ForemanUsers::Sygroup.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @sygroup }
+    end
+  end
+
+  # GET /sygroups/new
+  # GET /sygroups/new.json
+  def new
+    usermodel = ForemanUsers::Syusermodel.find(params[:syusermodel_id])
+    @sygroup = usermodel.sygroups.new
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # GET /sygroups/1/edit
+  def edit
+    @sygroup = ForemanUsers::Sygroup.find(params[:id])
+  end
+
+  # POST /sygroups
+  # POST /sygroups.json
+  def create
+    @sygroup = ForemanUsers::Sygroup.new(params[:foreman_users_sygroup])
+
+    respond_to do |format|
+      if @sygroup.save
+        format.js
+      else
+        format.js { render :template => 'layouts/error', locals: { errors: @syusers.errors } }
+      end
+    end
+  end
+
+  # PUT /sygroups/1
+  # PUT /sygroups/1.json
+  def update
+    @sygroup = ForemanUsers::Sygroup.find(params[:id])
+
+    respond_to do |format|
+      if @sygroup.update_attributes(params[:foreman_users_sygroup])
+        format.js
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @sygroup.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /sygroups/1
+  # DELETE /sygroups/1.json
+  def destroy
+    @sygroup = ForemanUsers::Sygroup.find(params[:id])
+    @sygroup.destroy
+    respond_to do |format|
+      format.js
+    end
+
+
+  end
+end

data/app/controllers/foreman_users/syusermodels_controller.rb

@@ -0,0 +1,90 @@
+class ForemanUsers::SyusermodelsController < ApplicationController
+  # GET /syusermodels
+  # GET /syusermodels.json
+  def index
+    @syusermodels = ForemanUsers::Syusermodel.all.paginate(:page => params[:page])
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @syusermodels }
+    end
+  end
+
+  # GET /syusermodels/1
+  # GET /syusermodels/1.json
+  def show
+    @syusermodel = ForemanUsers::Syusermodel.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @syusermodel }
+    end
+  end
+
+  # GET /syusermodels/new
+  # GET /syusermodels/new.json
+  def new
+    @syusermodel = ForemanUsers::Syusermodel.new
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @syusermodel }
+    end
+  end
+
+  # GET /syusermodels/1/edit
+  def edit
+    @syusermodel = ForemanUsers::Syusermodel.find(params[:id])
+    # sygroup_time = @syusermodel.sygroups.size
+    # if  sygroup_time == 0 
+    #   5.times { @syusermodel.sygroups.build}
+    # else
+    #   5.times { @syusermodel.sygroups.build}
+    # end
+  end
+
+  # POST /syusermodels
+  # POST /syusermodels.json
+  def create
+    @syusermodel = ForemanUsers::Syusermodel.new(params[:foreman_users_syusermodel])
+
+    respond_to do |format|
+      if @syusermodel.save
+        format.html { redirect_to @syusermodel, notice: 'Syusermodel was successfully created.' }
+        format.json { render json: @syusermodel, status: :created, location: @syusermodel }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @syusermodel.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /syusermodels/1
+  # PUT /syusermodels/1.json
+  def update
+    @syusermodel = ForemanUsers::Syusermodel.find(params[:id])
+
+    respond_to do |format|
+      if @syusermodel.update_attributes(params[:foreman_users_syusermodel])
+        format.html { redirect_to @syusermodel, notice: 'Syusermodel was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @syusermodel.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /syusermodels/1
+  # DELETE /syusermodels/1.json
+  def destroy
+    @syusermodel = ForemanUsers::Syusermodel.find(params[:id])
+    @syusermodel.destroy
+    @syusermodel.destory_dir
+    respond_to do |format|
+      format.html { redirect_to foreman_usermodels_syusermodels_url }
+      format.json { head :no_content }
+    end
+
+
+  end
+end

data/app/controllers/foreman_users/syusers_controller.rb

@@ -24,24 +24,17 @@ class ForemanUsers::SyusersController < ApplicationController
   # GET /syusers/new
   # GET /syusers/new.json
   def new
-    @syuser = ForemanUsers::Syuser.new
-    sygroups = @syuser.sygroups.new
-    #5.times { @syuser.sygroups.build}
+    usermodel = ForemanUsers::Syusermodel.find(params[:syusermodel_id])
+    @syuser = usermodel.syusers.new
+    #@syuser = ForemanUsers::Syuser.new
     respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @syuser }
+      format.js
     end
   end
 
   # GET /syusers/1/edit
   def edit
     @syuser = ForemanUsers::Syuser.find(params[:id])
-    # sygroup_time = @syuser.sygroups.size
-    # if  sygroup_time == 0 
-    #   5.times { @syuser.sygroups.build}
-    # else
-    #   5.times { @syuser.sygroups.build}
-    # end
   end
 
   # POST /syusers
@@ -51,11 +44,9 @@ class ForemanUsers::SyusersController < ApplicationController
 
     respond_to do |format|
       if @syuser.save
-        format.html { redirect_to @syuser, notice: 'Syuser was successfully created.' }
-        format.json { render json: @syuser, status: :created, location: @syuser }
+        format.js
       else
-        format.html { render action: "new" }
-        format.json { render json: @syuser.errors, status: :unprocessable_entity }
+        format.js { render :template => 'layouts/error', locals: { errors: @syusers.errors } }
       end
     end
   end
@@ -67,8 +58,7 @@ class ForemanUsers::SyusersController < ApplicationController
 
     respond_to do |format|
       if @syuser.update_attributes(params[:foreman_users_syuser])
-        format.html { redirect_to @syuser, notice: 'Syuser was successfully updated.' }
-        format.json { head :no_content }
+        format.js
       else
         format.html { render action: "edit" }
         format.json { render json: @syuser.errors, status: :unprocessable_entity }
@@ -81,10 +71,8 @@ class ForemanUsers::SyusersController < ApplicationController
   def destroy
     @syuser = ForemanUsers::Syuser.find(params[:id])
     @syuser.destroy
-    @syuser.destory_dir
     respond_to do |format|
-      format.html { redirect_to foreman_users_syusers_url }
-      format.json { head :no_content }
+      format.js
     end
 
 

data/app/models/foreman_users/sygroup.rb

@@ -1,4 +1,79 @@
 class ForemanUsers::Sygroup < ActiveRecord::Base
-  attr_accessible :name, :ensure, :gid, :groupable_type, :groupable_id, :user_id
-   belongs_to :foreman_users_syuser, class_name: "ForemanUsers::Syuser",foreign_key: "user_id"
+  attr_accessible :name, :ensure, :gid, :groupable_type, :groupable_id, :user_id, :syusermodel_id
+  #belongs_to :foreman_users_syuser, class_name: "ForemanUsers::Syuser",foreign_key: "user_id"
+  belongs_to :foreman_users_syusermodel, class_name: "ForemanUsers::Syusermodel",foreign_key: "syusermodel_id"
+	after_create :create_dir
+	after_update :create_dir
+	after_destroy :create_dir
+  def create_dir
+		#该处需要注意权限问题，当前用户是否具有该目录的操作权限
+		root_dir_name = "/etc/puppet/environments/production/modules/" + self.foreman_users_syusermodel.name
+
+		#该处需要注意权限问题，当前用户是否具有该目录的操作权限
+		root_dir_name = "/etc/puppet/environments/production/modules/" + self.foreman_users_syusermodel.name
+		#判断该目录是否存在
+		dir_exist_status = File.exist?(root_dir_name )
+		if dir_exist_status
+			FileUtils.rm_r root_dir_name
+		end #默认删除该目录，然后重新创建,主要目的防止文件或文件夹被误删除
+
+
+		#创建目录结构
+		Dir::mkdir(root_dir_name)
+		if !File.exist?(root_dir_name + "/files")
+			Dir::mkdir(root_dir_name + "/files")
+		end
+
+		if !File.exist?(root_dir_name + "/manifests")
+			Dir::mkdir(root_dir_name + "/manifests")
+		end
+
+		if File.exist?(root_dir_name + "/files")
+			if File.exist?(root_dir_name + "/files/welcome.conf")
+			#生成files下welcome.conf文件
+			files_welcome_File = File.new(root_dir_name + "/files/welcome.conf", "w+")
+  			files_welcome_File.close
+			end
+		end
+
+		if File.exist?(root_dir_name + "/manifests")
+			if File.exist?(root_dir_name + "/manifests/init.pp")
+				FileUtils.rm_r (root_dir_name + "/manifests/init.pp")
+  		end
+			#生成manifests下init.pp文件
+			main_init_File = File.new(root_dir_name +"/manifests/init.pp", "w+")
+			if main_init_File
+				main_init_File.syswrite(self.create_content)
+			else
+				puts "Unable to open file!"
+			end
+			main_init_File.close
+	  end
+	end
+
+  def destory_dir
+
+  end
+
+	def create_content
+		title_content = "class users {" 
+		user_content =  "\n" + "\s\s" 
+		if self.foreman_users_syusermodel.syusers.size > 0
+			self.foreman_users_syusermodel.syusers.each do |syuser|
+  			user_content +=  "\n" + "\s\s" + "user { '" + syuser.name + "':" + "\n\s\s\s\s" + "ensure => '" + syuser.ensure + "'," + "\n\s\s\s\s" + "gid => '" + syuser.gid + "'," + "\n\s\s\s\s" + "groups => [" + syuser.groups + "]," + "\n\s\s\s\s" + "home => '" + syuser.home + "'," + "\n\s\s\s\s" + "password => '" + syuser.password + "'," + "\n\s\s\s\s" + "password_max_age => '" + syuser.password_max_age + "'," + "\n\s\s\s\s" + "password_min_age => '" + syuser.password_min_age + "'," + "\n\s\s\s\s" + "shell => '" + syuser.shell + "'," + "\n\s\s\s\s" + "uid => '" + syuser.uid + "'," + "\n\s\s" +"}" + "\n"
+			end
+		end
+
+
+		group_content =  "\s\s"
+		if self.foreman_users_syusermodel.sygroups.size > 0
+			self.foreman_users_syusermodel.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" 
+  		end
+		end
+		title_content = title_content + user_content + group_content
+
+		rs = title_content + "\n" + "}"
+		return rs
+	end
 end

data/app/models/foreman_users/syuser.rb

@@ -1,87 +1,82 @@
 class ForemanUsers::Syuser < ActiveRecord::Base
-	require "fileutils"
-	attr_accessible :title, :body,  :name, :ensure , :gid, :groups, :home , :password, :password_max_age, :password_min_age, :shell, :uid, :sygroups_attributes
 
-    has_many :sygroups, class_name: "ForemanUsers::Sygroup"
-	accepts_nested_attributes_for :sygroups, reject_if: proc { |attributes| attributes['gid'].blank?| attributes['name'].blank? | attributes['ensure'].blank?  }  , allow_destroy: true
+	attr_accessible :title, :body,  :name, :ensure , :gid, :groups, :home , :password, :password_max_age, :password_min_age, :shell, :uid, :sygroups_attributes, :syusermodel_id
+	belongs_to :foreman_users_syusermodel, class_name: "ForemanUsers::Syusermodel",foreign_key: "syusermodel_id"
 
 	after_create :create_dir
 	after_update :create_dir
-	#after_destory :destory_dir
-	  def create_dir
-	  		#目前用 "/home/stdtnt/app/"代替  "/etc/puppet/environments/production/modules/users"
-	  		#该处需要注意权限问题，当前用户是否具有该目录的操作权限
-	  		root_dir_name = "/etc/puppet/environments/production/modules/users"
-	  		#self.destory_dir #默认删除该目录，然后重新创建
-	  		dir_exist_status = File.exist?(root_dir_name) #判断该目录是否存在
-	  		if !dir_exist_status
-	  			#创建目录结构
-	  			Dir::mkdir(root_dir_name)
-	  			if !File.exist?(root_dir_name + "/files")
-	  				Dir::mkdir(root_dir_name + "/files")
-	  			end
+	after_destroy :create_dir
+  def create_dir
+		#该处需要注意权限问题，当前用户是否具有该目录的操作权限
+		puts "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+		puts self.foreman_users_syusermodel
+		puts ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+		self.foreman_users_syusermodel.name
+		puts "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+		root_dir_name = "/etc/puppet/environments/production/modules/" + self.foreman_users_syusermodel.name
 
-				if !File.exist?(root_dir_name + "/manifests")
-	  				Dir::mkdir(root_dir_name + "/manifests")
-	  			end
-	  		end
-  			 if File.exist?(root_dir_name + "/files")
-	  			if File.exist?(root_dir_name + "/files/welcome.conf")
-					#生成files下welcome.conf文件
-					files_welcome_File = File.new(root_dir_name + "/files/welcome.conf", "w+")
-		  			files_welcome_File.close
-	  			end
-  			end
+		dir_exist_status = File.exist?(root_dir_name) #判断该目录是否存在
+		
+	
+		if dir_exist_status
+			FileUtils.rm_r root_dir_name
+		end #默认删除该目录，然后重新创建,主要目的防止文件或文件夹被误删除
 
-			if File.exist?(root_dir_name + "/manifests")
-				if File.exist?(root_dir_name + "/manifests/init.pp")
-					FileUtils.rm_r (root_dir_name + "/manifests/init.pp")
-	  			end
-  				#生成manifests下init.pp文件
-				main_init_File = File.new(root_dir_name +"/manifests/init.pp", "w+")
-					if main_init_File
-					   main_init_File.syswrite(self.create_content)
-					else
-					   puts "Unable to open file!"
-					end
-				main_init_File.close
-  			end
-	  end
 
+		#创建目录结构
+		Dir::mkdir(root_dir_name)
+		if !File.exist?(root_dir_name + "/files")
+			Dir::mkdir(root_dir_name + "/files")
+		end
+
+		if !File.exist?(root_dir_name + "/manifests")
+			Dir::mkdir(root_dir_name + "/manifests")
+		end
 
-	  def destory_dir
-	  		 #目前用 "/home/stdtnt/app/"代替  "/etc/puppet/environments/production/modules/users"
-	  		#该处需要注意权限问题，当前用户是否具有该目录的操作权限
-	  		root_dir_name = "/etc/puppet/environments/production/modules/users"
-	  		#判断该目录是否存在
-			dir_exist_status = File.exist?(root_dir_name )
-	  		if dir_exist_status
-	  			#使用fileUtils.rm_r 删除该文件夹及其以下所有内容
-	  			if ForemanUsers::Syuser.all.size  == 0 
-	  				FileUtils.rm_r root_dir_name
-	  			end
-	  		end
+		if File.exist?(root_dir_name + "/files")
+			if File.exist?(root_dir_name + "/files/welcome.conf")
+			#生成files下welcome.conf文件
+			files_welcome_File = File.new(root_dir_name + "/files/welcome.conf", "w+")
+  			files_welcome_File.close
+			end
+		end
+
+		if File.exist?(root_dir_name + "/manifests")
+			if File.exist?(root_dir_name + "/manifests/init.pp")
+				FileUtils.rm_r (root_dir_name + "/manifests/init.pp")
+  		end
+			#生成manifests下init.pp文件
+			main_init_File = File.new(root_dir_name +"/manifests/init.pp", "w+")
+			if main_init_File
+				main_init_File.syswrite(self.create_content)
+			else
+				puts "Unable to open file!"
+			end
+			main_init_File.close
 	  end
+	end
+
 
-	  	def create_content
-	  		#content = "class users { " + "\n" + "\s\s" + "include baseline::params" + "\n" + "\s\s" + "@user {'$user':" + "\n" + "\s\s\s\s" + "ensure => $user_ensure," + "\n" + "\s\s\s\s" + "home   => $user_home,"  + "\n" + "\s\s" + "}" + "\n" + "}"
-	  		#
-	  		title_content = "class users {" 
 
-	  		ForemanUsers::Syuser.all.each do |syuser|
-		  		user_content =  "\n" + "\s\s" + "user { '" + syuser.name + "':" + "\n\s\s\s\s" + "ensure => '" + syuser.ensure + "'," + "\n\s\s\s\s" + "gid => '" + syuser.gid + "'," + "\n\s\s\s\s" + "groups => [" + syuser.groups + "]," + "\n\s\s\s\s" + "home => '" + syuser.home + "'," + "\n\s\s\s\s" + "password => '" + syuser.password + "'," + "\n\s\s\s\s" + "password_max_age => '" + syuser.password_max_age + "'," + "\n\s\s\s\s" + "password_min_age => '" + syuser.password_min_age + "'," + "\n\s\s\s\s" + "shell => '" + syuser.shell + "'," + "\n\s\s\s\s" + "uid => '" + syuser.uid + "'," + "\n\s\s" +"}" + "\n"
+	def create_content
+		title_content = "class users {" 
+		user_content =  "\n" + "\s\s" 
+		if self.foreman_users_syusermodel.syusers.size > 0
+			self.foreman_users_syusermodel.syusers.each do |syuser|
+  			user_content +=  "\n" + "\s\s" + "user { '" + syuser.name + "':" + "\n\s\s\s\s" + "ensure => '" + syuser.ensure + "'," + "\n\s\s\s\s" + "gid => '" + syuser.gid + "'," + "\n\s\s\s\s" + "groups => [" + syuser.groups + "]," + "\n\s\s\s\s" + "home => '" + syuser.home + "'," + "\n\s\s\s\s" + "password => '" + syuser.password + "'," + "\n\s\s\s\s" + "password_max_age => '" + syuser.password_max_age + "'," + "\n\s\s\s\s" + "password_min_age => '" + syuser.password_min_age + "'," + "\n\s\s\s\s" + "shell => '" + syuser.shell + "'," + "\n\s\s\s\s" + "uid => '" + syuser.uid + "'," + "\n\s\s" +"}" + "\n"
+			end
+		end
 
-		  		group_content =  "\s\s"
-		  		if syuser.sygroups.size > 0
-		  			syuser.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" 
-	 	  			end
-		  		end
-		  		title_content = title_content + user_content + group_content
-	  		end
 
-	  		rs = title_content + "\n" + "}"
-	  		return rs
-	  	end
-end
+		group_content =  "\s\s"
+		if self.foreman_users_syusermodel.sygroups.size > 0
+			self.foreman_users_syusermodel.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" 
+  		end
+		end
+		title_content = title_content + user_content + group_content
 
+		rs = title_content + "\n" + "}"
+		return rs
+	end
+end

data/app/models/foreman_users/syusermodel.rb

@@ -0,0 +1,83 @@
+class ForemanUsers::Syusermodel < ActiveRecord::Base
+	require "fileutils"
+	attr_accessible :name, :remark
+
+  has_many :sygroups, class_name: "ForemanUsers::Sygroup",foreign_key: "syusermodel_id", :dependent => :destroy
+  has_many :syusers, class_name: "ForemanUsers::Syuser",foreign_key: "syusermodel_id", :dependent => :destroy
+
+	after_create :create_dir
+	after_update :create_dir
+	after_destroy :destory_dir
+  def create_dir
+		#该处需要注意权限问题，当前用户是否具有该目录的操作权限
+		root_dir_name = "/etc/puppet/environments/production/modules/" + self.name
+
+		dir_exist_status = File.exist?(root_dir_name) #判断该目录是否存在
+		self.destory_dir #默认删除该目录，然后重新创建,主要目的防止文件或文件夹被误删除
+		if !dir_exist_status
+			#创建目录结构
+			Dir::mkdir(root_dir_name)
+			if !File.exist?(root_dir_name + "/files")
+				Dir::mkdir(root_dir_name + "/files")
+			end
+
+			if !File.exist?(root_dir_name + "/manifests")
+				Dir::mkdir(root_dir_name + "/manifests")
+			end
+		end
+		if File.exist?(root_dir_name + "/files")
+			if File.exist?(root_dir_name + "/files/welcome.conf")
+			#生成files下welcome.conf文件
+			files_welcome_File = File.new(root_dir_name + "/files/welcome.conf", "w+")
+  			files_welcome_File.close
+			end
+		end
+
+		if File.exist?(root_dir_name + "/manifests")
+			if File.exist?(root_dir_name + "/manifests/init.pp")
+				FileUtils.rm_r (root_dir_name + "/manifests/init.pp")
+  		end
+			#生成manifests下init.pp文件
+			main_init_File = File.new(root_dir_name +"/manifests/init.pp", "w+")
+			if main_init_File
+				main_init_File.syswrite(self.create_content)
+			else
+				puts "Unable to open file!"
+			end
+			main_init_File.close
+	  end
+	end
+
+  def destory_dir
+		#该处需要注意权限问题，当前用户是否具有该目录的操作权限
+		root_dir_name = "/etc/puppet/environments/production/modules/" + self.name
+		#判断该目录是否存在
+		dir_exist_status = File.exist?(root_dir_name )
+		if dir_exist_status
+			FileUtils.rm_r root_dir_name
+		end
+  end
+
+	def create_content
+		title_content = "class users {" 
+		user_content =  "\n" + "\s\s" 
+		if self.syusers.size > 0
+			self.syusers.each do |syuser|
+  			user_content +=  "\n" + "\s\s" + "user { '" + syuser.name + "':" + "\n\s\s\s\s" + "ensure => '" + syuser.ensure + "'," + "\n\s\s\s\s" + "gid => '" + syuser.gid + "'," + "\n\s\s\s\s" + "groups => [" + syuser.groups + "]," + "\n\s\s\s\s" + "home => '" + syuser.home + "'," + "\n\s\s\s\s" + "password => '" + syuser.password + "'," + "\n\s\s\s\s" + "password_max_age => '" + syuser.password_max_age + "'," + "\n\s\s\s\s" + "password_min_age => '" + syuser.password_min_age + "'," + "\n\s\s\s\s" + "shell => '" + syuser.shell + "'," + "\n\s\s\s\s" + "uid => '" + syuser.uid + "'," + "\n\s\s" +"}" + "\n"
+			end
+		end
+
+
+		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" 
+  		end
+		end
+		title_content = title_content + user_content + group_content
+
+		rs = title_content + "\n" + "}"
+		return rs
+	end
+
+end

data/app/views/foreman_users/layouts/_model.html.erb

@@ -0,0 +1,12 @@
+  <div class="modal fade" id="formModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h4 class="modal-title" id="myModalLabel">请填写</h4>
+        </div>
+        <div class="modal-body">
+        </div>
+      </div>
+    </div>
+  </div>

data/app/views/foreman_users/layouts/layouts/_model.html.erb

@@ -0,0 +1,12 @@
+  <div class="modal fade" id="formModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h4 class="modal-title" id="myModalLabel">请填写</h4>
+        </div>
+        <div class="modal-body">
+        </div>
+      </div>
+    </div>
+  </div>

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

@@ -0,0 +1,29 @@
+<%= javascript 'sygroups', 'sygroup_edit', 'sygroup_edit_interfaces', 'class_edit', 'compute_resource', 'lookup_keys'%>
+
+    <%= form_for(@sygroup, remote: true) do |f| %>
+    <%= base_errors_for @sygroup %>
+    <div class="row clearfix">
+        <div class="row">
+          <div class="form-group col-md-3">
+            <label>name</label>
+            <%= f.text_field :name, :size => "col-md-3", placeholder: "填写用户名",  class: "form-control" %>
+          </div>
+          <div class="form-group col-md-3">
+            <label>ensure</label> <br />
+            <%= f.select :ensure, [['Please select an ensure', nil], 'present', 'absent', 'role'], placeholder: "ensure", control_label: 'ensure', class: "col-md-3 column form-control"%>
+          </div>
+
+          <div class="form-group col-md-3">
+                    <label>gid</label> 
+            <%= f.text_field :gid, :size => "col-md-3", placeholder: "填写gid",  class: "form-control" %>
+          </div>
+        </div>
+        <div class="row">
+          <div class="actions">
+            <%= f.hidden_field :syusermodel_id, value: @sygroup.syusermodel_id %>
+            <%= f.submit "提交", class: "btn btn-success" %>
+            <%= link_to '返回', foreman_users_sygroups_path, class: "btn btn-primary"  %>
+          </div> 
+        </div>
+    </div>
+  <% end %>

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

@@ -0,0 +1,43 @@
+<%= javascript "jquery.cookie" %>
+<% title header ||= "" %>
+<table class="table table-bordered table-striped table-condensed" >
+  <thead>
+    <tr>
+      <th class=''>name</th>
+      <th class="hidden-xs">ensure</th>
+      <th class="hidden-xs">gid</th>
+      <th>操作</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% sygroups.each do |sygroup| %>
+      <tr>
+        <td class=''><%= sygroup.name %></td>
+        <td class="hidden-xs"><%=  sygroup.ensure %></td>
+        <td class="hidden-xs"><%=  sygroup.gid %></td>
+        <td>
+          <%= link_to '查看', sygroup %>
+          <%= link_to '编辑', edit_foreman_users_sygroup_path(sygroup) %>
+          <%= link_to '删除', sygroup, method: :delete, data: { confirm: 'Are you sure?' } %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+<div id="confirmation-modal" class="modal fade">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title"><%= _('Please Confirm') %></h4>
+      </div>
+      <div class="modal-body">
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal"><%= _('Cancel') %></button>
+        <button type="button" class="btn btn-primary" onclick="submit_modal_form()"><%= _('Submit') %></button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+<%= will_paginate_with_info sygroups, :more => " - "+_("<b class='select_count'>0</b> selected") %>

data/app/views/foreman_users/sygroups/_sygroup.html.erb

@@ -0,0 +1,3 @@
+<tr id="sygroup-<%= sygroup.id %>">
+	<%= render partial: "foreman_users/sygroups/sygroup_td", locals: { sygroup: sygroup } %>
+</tr>

data/app/views/foreman_users/sygroups/_sygroup_td.html.erb

@@ -0,0 +1,7 @@
+<td><%= sygroup.name %></td>
+<td><%= sygroup.ensure %></td>
+<td><%= sygroup.gid %></td>
+<td>
+  <%= link_to '编辑', edit_foreman_users_sygroup_path(sygroup), remote: true %>
+  <%= link_to '删除', sygroup, method: :delete, remote: true, data: { confirm: 'Are you sure?' } %>
+</td>

data/app/views/foreman_users/sygroups/create.js.erb

@@ -0,0 +1,2 @@
+$('#formModal').modal("hide");
+$(".table.sygroups tbody").prepend('<%= escape_javascript(render(:partial => "foreman_users/sygroups/sygroup", locals: { :sygroup => @sygroup })) %>');

data/app/views/foreman_users/sygroups/destroy.js.erb

@@ -0,0 +1 @@
+$("#sygroup-<%= @sygroup.id %>").fadeOut(200).remove();

data/app/views/foreman_users/sygroups/edit.html.erb

@@ -0,0 +1 @@
+<%= render 'form' %>

data/app/views/foreman_users/sygroups/edit.js.erb

@@ -0,0 +1,3 @@
+$('#formModal').modal("show");
+$('#formModal .modal-body').html("<%= escape_javascript(render 'foreman_users/sygroups/form') %>");
+defaultInit();

data/app/views/foreman_users/sygroups/index.html.erb

@@ -0,0 +1,5 @@
+<% if authorized? %>
+  <% title_actions  button_group(link_to "新增", new_foreman_users_sygroup_path) %>
+<% end %>
+
+<%= render 'list', :sygroups => @sygroups, :header => @title || _("System Groups")  %>

data/app/views/foreman_users/sygroups/new.html.erb

@@ -0,0 +1 @@
+<%= render 'form' %>

data/app/views/foreman_users/sygroups/new.js.erb

@@ -0,0 +1,3 @@
+$('#formModal').modal("show");
+$('#formModal .modal-body').html("<%= escape_javascript(render 'foreman_users/sygroups/form') %>");
+defaultInit();

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

@@ -0,0 +1,28 @@
+
+<div class="container">
+	<div class="row">
+		<h1 class="clearfix">
+			<%= @sygroup.name %>
+			<%= link_to '返回', foreman_users_sygroup_path, class: "btn btn-primary pull-right mr1" %>
+			<%= link_to '编辑', edit_foreman_users_sygroup_path(@sygroup), class: "btn btn-warning pull-right mr1" %>
+		</h1>
+	</div>
+
+	<div class="row col-md-12">
+		<table class="table table-striped table-bordered">
+			<thead></thead>
+			<tbody>
+				<tr>
+					<td><strong>name</strong></td>
+					<td><strong>ensure</strong></td>
+					<td><strong>gid</strong></td>
+				</tr>
+				<tr>
+					<td><%= @sygroup.name %></td>
+					<td><%= @sygroup.ensure %></td>
+					<td><%= @sygroup.gid %></td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+</div>

data/app/views/foreman_users/sygroups/update.js.erb

@@ -0,0 +1,3 @@
+$('#formModal').modal("hide");
+$("#sygroup-<%= @sygroup.id %>").html('<%= escape_javascript(render(:partial => "foreman_users/sygroups/sygroup_td", locals: { :sygroup => @sygroup })) %>');
+defaultInit();

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

@@ -0,0 +1,24 @@
+<%= javascript 'syusermodels', 'syusermodel_edit', 'syusermodel_edit_interfaces', 'class_edit', 'compute_resource', 'lookup_keys'%>
+
+  <%= form_for @syusermodel,  :html => {:data => {:id => @syusermodel.try(:id), :submit => 'progress_bar'}} do |f| %>
+    <%= base_errors_for @syusermodel %>
+    <div class="row clearfix">
+        <div class="row">
+          <div class="form-group col-md-3">
+            <label>name</label>
+            <%= f.text_field :name, :size => "col-md-3", placeholder: "填写模块名",  class: "form-control" %>
+          </div>
+
+          <div class="form-group col-md-3">
+                    <label>remark</label> 
+            <%= f.text_field :remark, :size => "col-md-3", placeholder: "remark",  class: "form-control" %>
+          </div>
+        </div>
+        <div class="row">
+          <div class="actions">
+            <%= f.submit "提交", class: "btn btn-success" %>
+            <%= link_to '返回', foreman_users_syusermodels_path, class: "btn btn-primary"  %>
+          </div> 
+        </div>
+    </div>
+  <% end %>

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

@@ -0,0 +1,41 @@
+<%= javascript "jquery.cookie" %>
+<% title header ||= "" %>
+<table class="table table-bordered table-striped table-condensed" >
+  <thead>
+    <tr>
+      <th class=''>name</th>
+      <th class="hidden-xs">remark</th>
+      <th>操作</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% syusermodels.each do |syusermodel| %>
+      <tr>
+        <td class=''><%= syusermodel.name %></td>
+        <td class="hidden-xs"><%= syusermodel.remark %></td>
+        <td>
+          <%= link_to '查看', syusermodel %>
+          <%= link_to '编辑', edit_foreman_users_syusermodel_path(syusermodel) %>
+          <%= link_to '删除', syusermodel, method: :delete, data: { confirm: 'Are you sure?' } %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+<div id="confirmation-modal" class="modal fade">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title"><%= _('Please Confirm') %></h4>
+      </div>
+      <div class="modal-body">
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal"><%= _('Cancel') %></button>
+        <button type="button" class="btn btn-primary" onclick="submit_modal_form()"><%= _('Submit') %></button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+<%= will_paginate_with_info syusermodels, :more => " - "+_("<b class='select_count'>0</b> selected") %>

data/app/views/foreman_users/syusermodels/edit.html.erb

@@ -0,0 +1 @@
+<%= render 'form' %>

data/app/views/foreman_users/syusermodels/index.html.erb

@@ -0,0 +1,5 @@
+<% if authorized? %>
+  <% title_actions  button_group(link_to "新增", new_foreman_users_syusermodel_path) %>
+<% end %>
+
+<%= render 'list', :syusermodels => @syusermodels, :header => @title || _("System Usermodels")  %>

data/app/views/foreman_users/syusermodels/new.html.erb

@@ -0,0 +1 @@
+<%= render 'form' %>

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

@@ -0,0 +1,111 @@
+
+<div class="container">
+	<div class="row">
+		<h1 class="clearfix">
+			<%= @syusermodel.name %>
+			<%= link_to '返回', foreman_users_syusermodel_path, class: "btn btn-primary pull-right mr1" %>
+			<%= link_to '编辑', edit_foreman_users_syusermodel_path(@syusermodel), class: "btn btn-warning pull-right mr1" %>
+		</h1>
+	</div>
+
+	<div class="row">
+	<div class="col-md-12">
+		<table class="table table-striped table-bordered">
+			<thead></thead>
+			<tbody>
+				<tr>
+					<td><strong>name</strong></td>
+					<td><strong>remark</strong></td>
+				</tr>
+				<tr>
+					<td><%= @syusermodel.name %></td>
+					<td><%= @syusermodel.remark %></td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+
+
+	</div>
+	<div class="row">
+		  <div class="col-md-12">
+		    <ul class="nav nav-tabs mb1">
+		      <li class="active"><a href="#syusers" data-toggle="tab">User <span class="red"><%= @syusermodel.syusers.count %></a></li>
+		      <li><a href="#sygroups" data-toggle="tab">Group <span class="red"><%= @syusermodel.sygroups.count %></a></li>
+		    </ul>
+
+		    <div class="tab-content">
+		      <div class="tab-pane active" id="syusers">
+		        <div id="syusers">
+		          <%= link_to "new", new_foreman_users_syuser_path(syusermodel_id: @syusermodel.id), remote: true, class: "btn btn-primary pull-right" %>
+		          <div class="panel-body">
+		            <table class="table table-striped table-hover syusers">
+		              <thead>
+							      <th class=''>name</th>
+							      <th class="hidden-xs">ensure</th>
+							      <th class="hidden-xs">gid</th>
+							      <th class="hidden-tablet hidden-xs">groups</th>
+							      <th class="hidden-tablet hidden-xs">home</th>
+							      <th class="hidden-tablet hidden-xs">password</th>
+							      <th class="hidden-tablet hidden-xs">password_max_age</th>
+							      <th class="hidden-tablet hidden-xs">password_min_age</th>
+							      <th class="hidden-tablet hidden-xs">shell</th>
+							      <th class="hidden-tablet hidden-xs">uid</th>
+							      <th class="hidden-tablet hidden-xs">操作</th>
+		              </thead>
+		              <tbody>
+		                <% @syusermodel.syusers.each do |syuser| %>
+		                  <%= render partial: "foreman_users/syusers/syuser", locals: { syuser: syuser} %>
+		                <% end %>
+		              </tbody>
+		            </table>
+		          </div>
+
+			
+		        </div>
+		      </div>
+		      <div class="tab-pane" id="sygroups">
+		        <div id="sygroups">
+		        <%= link_to "new", new_foreman_users_sygroup_path(syusermodel_id: @syusermodel.id), remote: true, class: "btn btn-primary pull-right" %>
+							<div class="panel-body">
+								<table class="table table-bordered table-striped table-condensed sygroups" >
+								  <thead>
+								    <tr>
+								      <th class=''>name</th>
+								      <th class="hidden-xs">ensure</th>
+								      <th class="hidden-xs">gid</th>
+								      <th>操作</th>
+								    </tr>
+								  </thead>
+								  <tbody>
+								    <% @syusermodel.sygroups.each do |sygroup| %>
+											<%= render partial: "foreman_users/sygroups/sygroup", locals: { sygroup: sygroup} %>
+								    <% end %>
+								  </tbody>
+								</table>
+							</div>
+
+		        </div>
+		      </div>
+
+		  </div>
+		</div>
+	</div>
+
+	<!-- Modal -->
+	<div class="modal fade" id="formModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+	  <div class="modal-dialog">
+	    <div class="modal-content">
+	      <div class="modal-header">
+	        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+	        <h4 class="modal-title" id="myModalLabel">请填写</h4>
+	      </div>
+	      <div class="modal-body">
+	      </div>
+	    </div>
+	  </div>
+	</div>
+
+
+</div>
+

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

@@ -1,6 +1,6 @@
 <%= javascript 'syusers', 'syuser_edit', 'syuser_edit_interfaces', 'class_edit', 'compute_resource', 'lookup_keys'%>
 
-  <%= nested_form_for @syuser,  :html => {:data => {:id => @syuser.try(:id), :submit => 'progress_bar'}} do |f| %>
+  <%= form_for(@syuser, remote: true) do |f| %>
     <%= base_errors_for @syuser %>
     <div class="row clearfix">
         <div class="row">
@@ -54,17 +54,9 @@
                 <%= f.text_field :uid, :size => "col-md-6", placeholder: "填写uid,例如：609",  class: "form-control"%>
             </div>
         </div>
-        <p><span style="color:red">以下为group信息</span></p>
-        <div class="row">
-          <div class="col-md-12 column">
-            <%= render partial: "foreman_users/syusers/sub", locals: { f: f, object: @syuser } %>
-          </div>
-        </div>
-        <div class="row">
-          <br /><br />
-        </div>
         <div class="row">
           <div class="actions">
+            <%= f.hidden_field :syusermodel_id, value: @syuser.syusermodel_id %>
             <%= f.submit "提交", class: "btn btn-success" %>
             <%= link_to '返回', foreman_users_syusers_path, class: "btn btn-primary"  %>
           </div> 

data/app/views/foreman_users/syusers/_syuser.html.erb

@@ -0,0 +1,3 @@
+<tr id="syuser-<%= syuser.id %>">
+	<%= render partial: "foreman_users/syusers/syuser_td", locals: { syuser: syuser } %>
+</tr>

data/app/views/foreman_users/syusers/_syuser_td.html.erb

@@ -0,0 +1,14 @@
+<td><%= syuser.name %></td>
+<td><%= syuser.ensure %></td>
+<td><%= syuser.gid %></td>
+<td><%= syuser.groups %></td>
+<td><%= syuser.home %></td>
+<td><%= syuser.password %></td>
+<td><%= syuser.password_max_age %></td>
+<td><%= syuser.password_min_age %></td>
+<td><%= syuser.shell %></td>
+<td><%= syuser.uid %></td>
+<td>
+  <%= link_to '编辑', edit_foreman_users_syuser_path(syuser), remote: true %>
+  <%= link_to '删除', syuser, method: :delete, remote: true, data: { confirm: 'Are you sure?' } %>
+</td>

data/app/views/foreman_users/syusers/create.js.erb

@@ -0,0 +1,2 @@
+$('#formModal').modal("hide");
+$(".table.syusers tbody").prepend('<%= escape_javascript(render(:partial => "foreman_users/syusers/syuser", locals: { :syuser => @syuser })) %>');

data/app/views/foreman_users/syusers/destroy.js.erb

@@ -0,0 +1 @@
+$("#syuser-<%= @syuser.id %>").fadeOut(200).remove();

data/app/views/foreman_users/syusers/edit.js.erb

@@ -0,0 +1,3 @@
+$('#formModal').modal("show");
+$('#formModal .modal-body').html("<%= escape_javascript(render 'foreman_users/syusers/form') %>");
+defaultInit();

data/app/views/foreman_users/syusers/new.js.erb

@@ -0,0 +1,3 @@
+$('#formModal').modal("show");
+$('#formModal .modal-body').html("<%= escape_javascript(render 'foreman_users/syusers/form') %>");
+defaultInit();

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

@@ -53,25 +53,4 @@
 			</tbody>
 		</table>
 	</div>
-
-	<div class="row col-md-12">
-		<h2>groupList</h2>
-		<table class="table table-striped table-bordered">
-			<thead>
-				<th>groub_name</th>
-				<th>ensure</th>
-				<th>gid</th>
-		</thead>
-			<tbody>
-				<% @syuser.sygroups.each do |sygroup|%>
-					<tr class="success">
-						<td><%= sygroup.name %></td>
-						<td><%= sygroup.ensure %></td>
-						<td><%= sygroup.gid %></td>
-					</tr>
-				<% end %>
-			</tbody>
-		</table>
-	</div>
-
 </div>

data/app/views/foreman_users/syusers/update.js.erb

@@ -0,0 +1,3 @@
+$('#formModal').modal("hide");
+$("#syuser-<%= @syuser.id %>").html('<%= escape_javascript(render(:partial => "foreman_users/syusers/syuser_td", locals: { :syuser => @syuser })) %>');
+defaultInit();

data/config/routes.rb

@@ -1,13 +1,7 @@
 Rails.application.routes.draw do
   namespace :foreman_users do
-    resources :syusers #do
-    #   match 'index', to: 'foreman_users/users#index'
-    #   match 'show', to: 'foreman_users/users#show'
-    #   match 'new', to: 'foreman_users/users#new'
-    #   match 'edit', to: 'foreman_users/users#edit'
-    #   match 'create', to: 'foreman_users/users#create'
-    #   match 'update', to: 'foreman_users/users#update'
-    #   match 'destroy', to: 'foreman_users/users#destroy'
-    # end
+    resources :syusers
+    resources :sygroups
+    resources :syusermodels
   end
 end

data/db/migrate/20150918022411_create_syusers.rb

@@ -1,4 +1,5 @@
 class CreateSyusers < ActiveRecord::Migration
+	drop tables syusers if table_exists? :syusers
 	def change
 		create_table :syusers do |t|
 			t.string :name #名称

data/db/migrate/20150918050239_create_sygroups.rb

@@ -1,4 +1,5 @@
 class CreateSygroups < ActiveRecord::Migration
+	drop tables sygroups if table_exists? :sygroups
   def change
     create_table :sygroups do |t|
 		t.string :name

data/db/migrate/20150918050249_create_syusermodels.rb

@@ -0,0 +1,12 @@
+class CreateSyusermodels < ActiveRecord::Migration
+	drop tables syusermodels if table_exists? :syusermodels
+	def change
+		create_table :syusermodels do |t|
+			t.string :name #名称
+			t.text :remark  #备注
+			t.timestamps
+		end
+	end
+	add_column :syusers, :syusermodel_id, :integer
+	add_column :sygroups, :syusermodel_id, :integer
+end

data/lib/foreman_users/engine.rb

@@ -24,26 +24,31 @@ module ForemanUsers
           permission :view_foreman_users, :'foreman_users/syusers' => [:index, :show, :auto_complete_search] 
           permission :new_foreman_users, :'foreman_users/syusers' => [:new, :create] 
           permission :edit_foreman_users, :'foreman_users/syusers' => [:edit, :update] 
-          permission :delete_foreman_users, :'foreman_users/syusers' => [:destroy] 
+          permission :delete_foreman_users, :'foreman_users/syusers' => [:destroy]
 
+          permission :view_foreman_groups, :'foreman_users/sygroups' => [:index, :show, :auto_complete_search] 
+          permission :new_foreman_groups, :'foreman_users/sygroups' => [:new, :create] 
+          permission :edit_foreman_groups, :'foreman_users/sygroups' => [:edit, :update] 
+          permission :delete_foreman_groups, :'foreman_users/sygroups' => [:destroy] 
+
+
+          permission :view_foreman_usermodels, :'foreman_users/syusermodels' => [:index, :show, :auto_complete_search] 
+          permission :new_foreman_usermodels, :'foreman_users/syusermodels' => [:new, :create] 
+          permission :edit_foreman_usermodels, :'foreman_users/syusermodels' => [:edit, :update] 
+          permission :delete_foreman_usermodels, :'foreman_users/syusermodels' => [:destroy]
 
         end
 
         # Add a new role called 'Discovery' if it doesn't exist
-         role "ForemanUsers", [:view_foreman_users, :new_foreman_users, :edit_foreman_users, :delete_foreman_users]
+         role "ForemanUsers", [:view_foreman_users, :new_foreman_users, :edit_foreman_users, :delete_foreman_users, :view_foreman_groups, :new_foreman_groups, :edit_foreman_groups, :delete_foreman_groups, :view_foreman_usermodels, :new_foreman_usermodels, :edit_foreman_usermodels, :delete_foreman_usermodels]
 
 
         # add menu entry
        sub_menu :top_menu, :forema_user_menu, :caption=> N_('UserManage'), :after=> :export_menu do
-         menu :top_menu, :level1, :caption=>N_('User List'), :url_hash => { :controller => 'foreman_users/syusers', :action => :index }, :resource_type => ForemanUsers::Syuser.name
-         menu :top_menu, :level2, :caption=>N_('New User'), :url_hash => { :controller => 'foreman_users/syusers', :action => :new }, :resource_type => ForemanUsers::Syuser.name
-         # menu :top_menu, :level2, :url_hash => {:controller=> :example, :action=>:index}
-         # menu :top_menu, :level3, :url_hash => {:controller=> :example, :action=>:index}
-         # sub_menu :top_menu, :inner_level, :caption=> N_('Inner level') do
-         #   menu :top_menu, :level41, :url_hash => {:controller=> :example, :action=>:index}
-         #   menu :top_menu, :level42, :url_hash => {:controller=> :example, :action=>:index}
-         # end
-         # menu :top_menu, :level5, :url_hash => {:controller=> :example, :action=>:index}
+         menu :top_menu, :level1, :caption=>N_('UserModel List'), :url_hash => { :controller => 'foreman_users/syusermodels', :action => :index }, :resource_type => ForemanUsers::Syusermodel.name
+         #menu :top_menu, :level2, :caption=>N_('User List'), :url_hash => { :controller => 'foreman_users/syusers', :action => :index }, :resource_type => ForemanUsers::Syuser.name
+         #menu :top_menu, :level3, :caption=>N_('Group List'), :url_hash => { :controller => 'foreman_users/sygroups', :action => :index }, :resource_type => ForemanUsers::Sygroup.name
+         #menu :top_menu, :level4, :caption=>N_('New User'), :url_hash => { :controller => 'foreman_users/syusers', :action => :new }, :resource_type => ForemanUsers::Syuser.name
        end
 
 

data/lib/foreman_users/version.rb

@@ -1,3 +1,3 @@
 module ForemanUsers
-  VERSION = '1.1.4'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_users
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: compass-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -83,24 +99,54 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/views/dashboard/_foreman_users_widget.html.erb
-- app/views/foreman_users/layouts/layouts/new_layout.html.erb
-- app/views/foreman_users/layouts/new_layout.html.erb
+- app/views/foreman_users/syusermodels/edit.html.erb
+- app/views/foreman_users/syusermodels/new.html.erb
+- app/views/foreman_users/syusermodels/show.html.erb
+- app/views/foreman_users/syusermodels/index.html.erb
+- app/views/foreman_users/syusermodels/_list.html.erb
+- app/views/foreman_users/syusermodels/_form.html.erb
+- app/views/foreman_users/layouts/layouts/_model.html.erb
+- app/views/foreman_users/layouts/_model.html.erb
 - app/views/foreman_users/syusers/edit.html.erb
+- app/views/foreman_users/syusers/destroy.js.erb
+- app/views/foreman_users/syusers/create.js.erb
 - app/views/foreman_users/syusers/new.html.erb
+- app/views/foreman_users/syusers/update.js.erb
+- app/views/foreman_users/syusers/new.js.erb
 - app/views/foreman_users/syusers/show.html.erb
 - app/views/foreman_users/syusers/index.html.erb
 - app/views/foreman_users/syusers/_list.html.erb
 - app/views/foreman_users/syusers/_form.html.erb
+- app/views/foreman_users/syusers/_syuser.html.erb
 - app/views/foreman_users/syusers/_sub.html.erb
+- app/views/foreman_users/syusers/_syuser_td.html.erb
+- app/views/foreman_users/syusers/edit.js.erb
+- app/views/foreman_users/sygroups/edit.html.erb
+- app/views/foreman_users/sygroups/destroy.js.erb
+- app/views/foreman_users/sygroups/create.js.erb
+- app/views/foreman_users/sygroups/new.html.erb
+- app/views/foreman_users/sygroups/update.js.erb
+- app/views/foreman_users/sygroups/new.js.erb
+- app/views/foreman_users/sygroups/_sygroup_td.html.erb
+- app/views/foreman_users/sygroups/show.html.erb
+- app/views/foreman_users/sygroups/index.html.erb
+- app/views/foreman_users/sygroups/_list.html.erb
+- app/views/foreman_users/sygroups/_form.html.erb
+- app/views/foreman_users/sygroups/edit.js.erb
+- app/views/foreman_users/sygroups/_sygroup.html.erb
 - app/views/foreman_users/hosts/hosts/new_action.html.erb
 - app/views/foreman_users/hosts/new_action.html.erb
 - app/assets/javascripts/application.js
 - app/overrides/dashboard/index/sample_override.html.erb.deface
 - app/controllers/foreman_users/syusers_controller.rb
+- app/controllers/foreman_users/sygroups_controller.rb
+- app/controllers/foreman_users/syusermodels_controller.rb
 - app/helpers/foreman_users/syusers_helper.rb
 - app/models/foreman_users/syuser.rb
 - app/models/foreman_users/sygroup.rb
+- app/models/foreman_users/syusermodel.rb
 - config/routes.rb
+- db/migrate/20150918050249_create_syusermodels.rb
 - db/migrate/20150918050239_create_sygroups.rb
 - db/migrate/syusers/edit.html.erb
 - db/migrate/syusers/new.html.erb