foreman_users 0.0.18.1 → 0.0.18.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. data/app/controllers/foreman_users/users_controller.rb +23 -23
  2. data/app/views/foreman_users/users/_form.html.erb +3 -3
  3. data/app/views/foreman_users/users/_list.html.erb +4 -4
  4. data/app/views/foreman_users/users/index.html.erb +1 -1
  5. data/app/views/foreman_users/users/show.html.erb +15 -15
  6. data/lib/foreman_users/version.rb +1 -1
  7. metadata +1 -1
data/app/controllers/foreman_users/users_controller.rb CHANGED
@@ -3,59 +3,59 @@ module ForemanUsers
3
3
  # GET /foreman_users
4
4
  # GET /foreman_users.json
5
5
  def index
6
- @users = ForemanUsers::User.all.paginate(:page => params[:page])
6
+ @foreman_users_users = ForemanUsers::User.all.paginate(:page => params[:page])
7
7
 
8
8
  respond_to do |format|
9
9
  format.html # index.html.erb
10
- format.json { render json: @users }
10
+ format.json { render json: @foreman_users_users }
11
11
  end
12
12
  end
13
13
 
14
14
  # GET /foreman_users/1
15
15
  # GET /foreman_users/1.json
16
16
  def show
17
- @user = ForemanUsers::User.find(params[:id])
17
+ @foreman_users_user = ForemanUsers::User.find(params[:id])
18
18
 
19
19
  respond_to do |format|
20
20
  format.html # show.html.erb
21
- format.json { render json: @user }
21
+ format.json { render json: @foreman_users_user }
22
22
  end
23
23
  end
24
24
 
25
25
  # GET /foreman_users/new
26
26
  # GET /foreman_users/new.json
27
27
  def new
28
- @user = ForemanUsers::User.new
29
- 5.times { @user.groups.build}
28
+ @foreman_users_user = ForemanUsers::User.new
29
+ 5.times { @foreman_users_user.groups.build}
30
30
  respond_to do |format|
31
31
  format.html # new.html.erb
32
- format.json { render json: @user }
32
+ format.json { render json: @foreman_users_user }
33
33
  end
34
34
  end
35
35
 
36
36
  # GET /foreman_users/1/edit
37
37
  def edit
38
- @user = ForemanUsers::User.find(params[:id])
39
- group_time = @user.groups.size
38
+ @foreman_users_user = ForemanUsers::User.find(params[:id])
39
+ group_time = @foreman_users_user.groups.size
40
40
  if group_time == 0
41
- 5.times { @user.groups.build}
41
+ 5.times { @foreman_users_user.groups.build}
42
42
  else
43
- 5.times { @user.groups.build}
43
+ 5.times { @foreman_users_user.groups.build}
44
44
  end
45
45
  end
46
46
 
47
47
  # POST /foreman_users
48
48
  # POST /foreman_users.json
49
49
  def create
50
- @user = ForemanUsers::User.new(params[:foreman_user])
50
+ @foreman_users_user = ForemanUsers::User.new(params[:foreman_users_user])
51
51
 
52
52
  respond_to do |format|
53
- if @user.save
54
- format.html { redirect_to @user, notice: 'foreman_user was successfully created.' }
55
- format.json { render json: @user, status: :created, location: @user }
53
+ if @foreman_users_user.save
54
+ format.html { redirect_to @foreman_users_user, notice: 'foreman_user was successfully created.' }
55
+ format.json { render json: @foreman_users_user, status: :created, location: @foreman_users_user }
56
56
  else
57
57
  format.html { render action: "new" }
58
- format.json { render json: @user.errors, status: :unprocessable_entity }
58
+ format.json { render json: @foreman_users_user.errors, status: :unprocessable_entity }
59
59
  end
60
60
  end
61
61
  end
@@ -63,15 +63,15 @@ module ForemanUsers
63
63
  # PUT /foreman_users/1
64
64
  # PUT /foreman_users/1.json
65
65
  def update
66
- @user = ForemanUsers::User.find(params[:id])
66
+ @foreman_users_user = ForemanUsers::User.find(params[:id])
67
67
 
68
68
  respond_to do |format|
69
- if @user.update_attributes(params[:foreman_user])
70
- format.html { redirect_to @user, notice: 'foreman_user was successfully updated.' }
69
+ if @foreman_users_user.update_attributes(params[:foreman_users_user])
70
+ format.html { redirect_to @foreman_users_user, notice: 'foreman_user was successfully updated.' }
71
71
  format.json { head :no_content }
72
72
  else
73
73
  format.html { render action: "edit" }
74
- format.json { render json: @user.errors, status: :unprocessable_entity }
74
+ format.json { render json: @foreman_users_user.errors, status: :unprocessable_entity }
75
75
  end
76
76
  end
77
77
  end
@@ -79,9 +79,9 @@ module ForemanUsers
79
79
  # DELETE /foreman_users/1
80
80
  # DELETE /foreman_users/1.json
81
81
  def destroy
82
- @user = ForemanUsers::User.find(params[:id])
83
- @user.destroy
84
- @user.destory_dir
82
+ @foreman_users_user = ForemanUsers::User.find(params[:id])
83
+ @foreman_users_user.destroy
84
+ @foreman_users_user.destory_dir
85
85
  respond_to do |format|
86
86
  format.html { redirect_to foreman_users_url }
87
87
  format.json { head :no_content }
data/app/views/foreman_users/users/_form.html.erb CHANGED
@@ -1,7 +1,7 @@
1
- <%= javascript 'users', 'user_edit', 'user_edit_interfaces', 'class_edit', 'compute_resource', 'lookup_keys'%>
1
+ <%= javascript 'foreman_users_users', 'foreman_users_user_edit', 'foreman_users_user_edit_interfaces', 'class_edit', 'compute_resource', 'lookup_keys'%>
2
2
 
3
- <%= form_for @user, :html => {:data => {:id => @user.try(:id), :submit => 'progress_bar'}} do |f| %>
4
- <%= base_errors_for @user %>
3
+ <%= form_for @foreman_users_user, :html => {:data => {:id => foreman_users_user.try(:id), :submit => 'progress_bar'}} do |f| %>
4
+ <%= base_errors_for foreman_users_user %>
5
5
  <div class="row clearfix">
6
6
  <div class="row">
7
7
  <div class="form-group col-md-6">
data/app/views/foreman_users/users/_list.html.erb CHANGED
@@ -17,9 +17,9 @@
17
17
  </tr>
18
18
  </thead>
19
19
  <tbody>
20
- <% users.each do |user| %>
20
+ <% foreman_users_users.each do |user| %>
21
21
  <tr>
22
- <td class="hidden-tablet hidden-xs"><%#= user.username %></td>
22
+ <td class="hidden-tablet hidden-xs"><%= user.username %></td>
23
23
  <td class="hidden-xs"><%= user.ensure %></td>
24
24
  <td class="hidden-xs"><%= user.gid %></td>
25
25
  <td class="hidden-tablet hidden-xs"><%= user.groups %></td>
@@ -31,7 +31,7 @@
31
31
  <td class="hidden-tablet hidden-xs"><%= user.uid %></td>
32
32
  <td>
33
33
  <%= link_to '查看', user %>
34
- <%= link_to '编辑', edit_user_path(user) %>
34
+ <%= link_to '编辑', edit_foreman_users_user_path(user) %>
35
35
  <%= link_to '删除', user, method: :delete, data: { confirm: 'Are you sure?' } %>
36
36
  </td>
37
37
  </tr>
@@ -54,4 +54,4 @@
54
54
  </div><!-- /.modal-content -->
55
55
  </div><!-- /.modal-dialog -->
56
56
  </div><!-- /.modal -->
57
- <%= will_paginate_with_info users, :more => " - "+_("<b class='select_count'>0</b> selected") %>
57
+ <%= will_paginate_with_info foreman_users_users, :more => " - "+_("<b class='select_count'>0</b> selected") %>
data/app/views/foreman_users/users/index.html.erb CHANGED
@@ -2,4 +2,4 @@
2
2
  <% title_actions button_group(link_to "新增", new_user_path) %>
3
3
  <% end %>
4
4
 
5
- <%= render 'list', :users => @users, :header => @title || _("users") %>
5
+ <%= render 'list', :foreman_users_users => @foreman_users_user, :header => @title || _("users") %>
data/app/views/foreman_users/users/show.html.erb CHANGED
@@ -2,9 +2,9 @@
2
2
  <div class="container">
3
3
  <div class="row">
4
4
  <h1 class="clearfix">
5
- <%= @user.name %>
5
+ <%= @foreman_users_user.name %>
6
6
  <%= link_to '返回', user_path, class: "btn btn-primary pull-right mr1" %>
7
- <%= link_to '编辑', edit_user_path(@user), class: "btn btn-warning pull-right mr1" %>
7
+ <%= link_to '编辑', edit_user_path(@foreman_users_user), class: "btn btn-warning pull-right mr1" %>
8
8
  </h1>
9
9
  </div>
10
10
 
@@ -19,10 +19,10 @@
19
19
  <td><strong>groups</strong></td>
20
20
  </tr>
21
21
  <tr>
22
- <td><%= @user.username %></td>
23
- <td><%= @user.ensure %></td>
24
- <td><%= @user.gid %></td>
25
- <td><%= @user.groups %></td>
22
+ <td><%= @foreman_users_user.username %></td>
23
+ <td><%= @foreman_users_user.ensure %></td>
24
+ <td><%= @foreman_users_user.gid %></td>
25
+ <td><%= @foreman_users_user.groups %></td>
26
26
  </tr>
27
27
 
28
28
  <tr>
@@ -32,10 +32,10 @@
32
32
  <td><strong>password_min_age</strong></td>
33
33
  </tr>
34
34
  <tr>
35
- <td><%= @user.home %></td>
36
- <td><%= @user.password %></td>
37
- <td><%= @user.password_max_age %></td>
38
- <td><%= @user.password_min_age %></td>
35
+ <td><%= @foreman_users_user.home %></td>
36
+ <td><%= @foreman_users_user.password %></td>
37
+ <td><%= @foreman_users_user.password_max_age %></td>
38
+ <td><%= @foreman_users_user.password_min_age %></td>
39
39
  </tr>
40
40
 
41
41
  <tr>
@@ -45,10 +45,10 @@
45
45
  <td><strong>updated_at</strong></td>
46
46
  </tr>
47
47
  <tr>
48
- <td><%= @user.shell %></td>
49
- <td><%= @user.uid %></td>
50
- <td><%= @user.created_at %></td>
51
- <td><%= @user.updated_at %></td>
48
+ <td><%= @foreman_users_user.shell %></td>
49
+ <td><%= @foreman_users_user.uid %></td>
50
+ <td><%= @foreman_users_user.created_at %></td>
51
+ <td><%= @foreman_users_user.updated_at %></td>
52
52
  </tr>
53
53
  </tbody>
54
54
  </table>
@@ -63,7 +63,7 @@
63
63
  <th>gid</th>
64
64
  </thead>
65
65
  <tbody>
66
- <% @user.groups.each do |group|%>
66
+ <% @foreman_users_user.groups.each do |group|%>
67
67
  <tr class="success">
68
68
  <td><%= group.groupname %></td>
69
69
  <td><%= group.ensure %></td>
data/lib/foreman_users/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ForemanUsers
2
- VERSION = '0.0.18.1'
2
+ VERSION = '0.0.18.2'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_users
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.18.1
4
+ version: 0.0.18.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors: