usman 0.3.33 → 0.3.34

Sign up to get free protection for your applications and to get access to all the features.
Files changed (26) hide show
  1. checksums.yaml +5 -5
  2. data/app/controllers/usman/features_controller.rb +25 -3
  3. data/app/controllers/usman/permissions_controller.rb +1 -1
  4. data/app/controllers/usman/users_controller.rb +2 -2
  5. data/app/models/feature.rb +15 -3
  6. data/app/uploaders/profile_picture_uploader.rb +2 -2
  7. data/app/views/layouts/kuppayam/_sidebar.html.erb +1 -1
  8. data/app/views/usman/dashboard/_index.html.erb +1 -1
  9. data/app/views/usman/features/_form.html.erb +1 -1
  10. data/app/views/usman/features/_index.html.erb +13 -8
  11. data/app/views/usman/features/_permissions.html.erb +54 -0
  12. data/app/views/usman/features/_row.html.erb +4 -2
  13. data/app/views/usman/features/_show.html.erb +63 -18
  14. data/app/views/usman/features/index.html.erb +22 -15
  15. data/app/views/usman/features/update_permission.js.erb +6 -0
  16. data/app/views/usman/roles/_index.html.erb +5 -5
  17. data/app/views/usman/roles/_row.html.erb +4 -4
  18. data/app/views/usman/roles/_show.html.erb +32 -64
  19. data/app/views/usman/roles/index.html.erb +1 -1
  20. data/app/views/usman/user_roles/_index.html.erb +8 -8
  21. data/app/views/usman/users/_index.html.erb +22 -31
  22. data/app/views/usman/users/_row.html.erb +23 -29
  23. data/app/views/usman/users/_show.html.erb +114 -203
  24. data/config/routes.rb +1 -0
  25. data/lib/usman/version.rb +1 -1
  26. metadata +9 -7
data/app/views/usman/user_roles/_index.html.erb CHANGED
@@ -2,10 +2,10 @@
2
2
  <table class="table table-hover members-table middle-align">
3
3
  <thead>
4
4
  <tr>
5
- <th style="text-align: center;width:60px">#</th>
6
- <th style="text-align: center;width:100px"><i class="fa fa-photo"></i></th>
5
+ <th style="width:60px" class="hidden-sm hidden-xs">#</th>
6
+ <th style="width:100px"><i class="fa fa-photo"></i></th>
7
7
  <th>Name</th>
8
- <th>Roles</th>
8
+ <th class="hidden-sm hidden-xs">Roles</th>
9
9
  <% if display_delete_links? %>
10
10
  <th style="text-align: center;" colspan="2">Actions</th>
11
11
  <% end %>
@@ -19,7 +19,7 @@
19
19
 
20
20
  <tr id="tr_user_<%= user.id %>">
21
21
 
22
- <th scope="row" style="text-align: center;">
22
+ <th scope="row" style="" class="hidden-sm hidden-xs">
23
23
  <% if i < 0 %>
24
24
  <i class="fa fa-check text-success"></i>
25
25
  <% else %>
@@ -27,15 +27,15 @@
27
27
  <% end %>
28
28
  </th>
29
29
 
30
- <td class="user-image">
30
+ <td class="">
31
31
  <%= link_to(user_path(user), remote: true) do %>
32
- <%= display_image(user, "profile_picture.image.small.url", width: "120", height: "auto", class: "img-rectangle", alt: user.display_name) %>
32
+ <%= display_image(user, "profile_picture.image.small.url", width: "40", height: "auto", class: "img-rectangle", alt: user.display_name) %>
33
33
  <% end %>
34
34
  </td>
35
35
 
36
- <td class="user-name"><%= user.display_name %></td>
36
+ <td><%= user.display_name %></td>
37
37
 
38
- <td class="user-name">
38
+ <td class="hidden-sm hidden-xs">
39
39
  <% user.roles.collect(&:name).each do |r| %>
40
40
  <span class="ml-5 label label-primary"><%= r %></span>
41
41
  <% end %>
data/app/views/usman/users/_index.html.erb CHANGED
@@ -2,15 +2,12 @@
2
2
  <table class="table table-hover members-table middle-align">
3
3
  <thead>
4
4
  <tr>
5
- <th style="text-align: center;width:60px">#</th>
6
- <th style="text-align: center;width:100px"><i class="fa fa-photo"></i></th>
5
+ <th style="width:60px" class="hidden-sm hidden-xs">#</th>
6
+ <th style="width:100px"><i class="fa fa-photo"></i></th>
7
7
  <th>Name</th>
8
- <th class="hidden-xs hidden-sm">Username</th>
9
- <th class="hidden-xs hidden-sm">Email</th>
10
8
  <th class="hidden-xs hidden-sm">Roles</th>
11
- <th>Status</th>
12
9
  <% if display_manage_links? %>
13
- <th style="text-align: center;" colspan="2">Actions</th>
10
+ <th style="text-align: center" colspan="2" class="hidden-sm hidden-xs">Actions</th>
14
11
  <% end %>
15
12
  </tr>
16
13
  </thead>
@@ -22,11 +19,7 @@
22
19
 
23
20
  <tr id="tr_user_<%= user.id %>">
24
21
 
25
- <!-- <td class="user-cb">
26
- <input type="checkbox" class="cbr" name="users[]" value="1" checked />
27
- </td> -->
28
-
29
- <th scope="row" style="text-align: center;">
22
+ <th scope="row" style="" class="hidden-sm hidden-xs">
30
23
  <% if i < 0 %>
31
24
  <i class="fa fa-check text-success"></i>
32
25
  <% else %>
@@ -34,18 +27,26 @@
34
27
  <% end %>
35
28
  </th>
36
29
 
37
- <td class="user-image">
30
+ <td class="">
38
31
  <%= link_to(user_path(user), remote: true) do %>
39
- <%= display_image(user, "profile_picture.image.small.url", width: "120", height: "auto", class: "img-rectangle", alt: user.display_name) %>
32
+ <%= display_image(user, "profile_picture.image.small.url", width: "40", height: "auto", class: "img-rectangle", alt: user.display_name) %>
40
33
  <% end %>
41
34
  </td>
42
35
 
43
- <td class="user-name"><%= link_to user.name, user_path(user), remote: true %></td>
44
-
45
- <td class="hidden-xs hidden-sm"><%= link_to user.username, user_path(user), remote: true %></td>
36
+ <td class="user-name">
37
+ <%= link_to user.name, user_path(user), remote: true %>
38
+ <% if user.pending? %>
39
+ <span class="ml-5 mt-5 label label-default">Pending</span>
40
+ <% elsif user.approved? %>
41
+ <span class="ml-5 mt-5 label label-success">Approved</span>
42
+ <% elsif user.suspended? %>
43
+ <span class="ml-5 mt-5 label label-danger">Suspended</span>
44
+ <% end %>
45
+ <br>
46
+ <%= link_to user.username, user_path(user), remote: true, style: "color: red" %><br>
47
+ <%= link_to user.email, user_path(user), remote: true, class: "email" %>
48
+ </td>
46
49
 
47
- <td class="hidden-xs hidden-sm"><%= link_to user.email, user_path(user), remote: true, class: "email" %></td>
48
-
49
50
  <% if @current_user.super_admin? %>
50
51
  <td class="hidden-xs hidden-sm">
51
52
  <% if user.super_admin? %>
@@ -57,25 +58,15 @@
57
58
  <% end %>
58
59
  </td>
59
60
  <% else %>
60
- <td class="user-name">
61
+ <td class="hidden-xs hidden-sm">
61
62
  <% user.roles.collect(&:name).each do |r| %>
62
63
  <span class="ml-5 label label-primary"><%= r %></span>
63
64
  <% end %>
64
65
  </td>
65
66
  <% end %>
66
67
 
67
- <td>
68
- <% if user.pending? %>
69
- <span class="ml-5 mt-5 label label-default">Pending</span>
70
- <% elsif user.approved? %>
71
- <span class="ml-5 mt-5 label label-success">Approved</span>
72
- <% elsif user.suspended? %>
73
- <span class="ml-5 mt-5 label label-danger">Suspended</span>
74
- <% end %>
75
- </td>
76
-
77
68
  <% if display_manage_links? %>
78
- <td class="action-links" style="width:15%">
69
+ <td class="action-links hidden-xs hidden-sm" style="width:15%">
79
70
 
80
71
  <%= link_to raw("<i class=\"linecons-pencil\"></i> Edit User"), edit_link, :remote=>true, class: "edit" if user.can_be_edited? && display_edit_links? %>
81
72
 
@@ -84,7 +75,7 @@
84
75
  <% end %>
85
76
 
86
77
  <% if display_edit_links? %>
87
- <td class="action-links" style="width:15%">
78
+ <td class="action-links hidden-xs hidden-sm" style="width:15%">
88
79
 
89
80
  <!-- Approve -->
90
81
  <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Approve"), update_status_user_path(:id =>user.id, :status =>'approved'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_approved? && (@current_user != user) %>
data/app/views/usman/users/_row.html.erb CHANGED
@@ -2,12 +2,8 @@
2
2
  <% delete_link = user_path(id: user.id) %>
3
3
 
4
4
  <tr id="tr_user_<%= user.id %>">
5
-
6
- <!-- <td class="user-cb">
7
- <input type="checkbox" class="cbr" name="users[]" value="1" checked />
8
- </td> -->
9
-
10
- <th scope="row" style="text-align: center;">
5
+
6
+ <th scope="row" style="" class="hidden-sm hidden-xs">
11
7
  <% if i < 0 %>
12
8
  <i class="fa fa-check text-success"></i>
13
9
  <% else %>
@@ -15,17 +11,25 @@
15
11
  <% end %>
16
12
  </th>
17
13
 
18
- <td class="user-image hidden-xs hidden-sm">
14
+ <td class="">
19
15
  <%= link_to(user_path(user), remote: true) do %>
20
- <%= display_image(user, "profile_picture.image.small.url", width: "120", height: "auto", class: "img-rectangle", alt: user.display_name) %>
21
- <% end %>
16
+ <%= display_image(user, "profile_picture.image.small.url", width: "40", height: "auto", class: "img-rectangle", alt: user.display_name) %>
17
+ <% end %>
22
18
  </td>
23
19
 
24
- <td class="user-name"><%= link_to user.name, user_path(user), remote: true %></td>
25
-
26
- <td class="hidden-xs hidden-sm"><%= link_to user.username, user_path(user), remote: true %></td>
27
-
28
- <td class="hidden-xs hidden-sm"><%= link_to user.email, user_path(user), remote: true, class: "email" %></td>
20
+ <td class="user-name">
21
+ <%= link_to user.name, user_path(user), remote: true %>
22
+ <% if user.pending? %>
23
+ <span class="ml-5 mt-5 label label-default">Pending</span>
24
+ <% elsif user.approved? %>
25
+ <span class="ml-5 mt-5 label label-success">Approved</span>
26
+ <% elsif user.suspended? %>
27
+ <span class="ml-5 mt-5 label label-danger">Suspended</span>
28
+ <% end %>
29
+ <br>
30
+ <%= link_to user.username, user_path(user), remote: true, style: "color: red" %><br>
31
+ <%= link_to user.email, user_path(user), remote: true, class: "email" %>
32
+ </td>
29
33
 
30
34
  <% if @current_user.super_admin? %>
31
35
  <td class="hidden-xs hidden-sm">
@@ -38,34 +42,24 @@
38
42
  <% end %>
39
43
  </td>
40
44
  <% else %>
41
- <td class="user-name">
45
+ <td class="hidden-xs hidden-sm">
42
46
  <% user.roles.collect(&:name).each do |r| %>
43
47
  <span class="ml-5 label label-primary"><%= r %></span>
44
48
  <% end %>
45
49
  </td>
46
50
  <% end %>
47
51
 
48
- <td>
49
- <% if user.pending? %>
50
- <span class="ml-5 mt-5 label label-default">Pending</span>
51
- <% elsif user.approved? %>
52
- <span class="ml-5 mt-5 label label-success">Approved</span>
53
- <% elsif user.suspended? %>
54
- <span class="ml-5 mt-5 label label-danger">Suspended</span>
55
- <% end %>
56
- </td>
57
-
58
52
  <% if display_manage_links? %>
59
- <td class="action-links" style="width:15%">
53
+ <td class="action-links hidden-xs hidden-sm" style="width:15%">
60
54
 
61
55
  <%= link_to raw("<i class=\"linecons-pencil\"></i> Edit User"), edit_link, :remote=>true, class: "edit" if user.can_be_edited? && display_edit_links? %>
62
56
 
63
- <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" if user.can_be_deleted? && (@current_user != user) && display_delete_links? %>
57
+ <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" if @current_user.super_admin? && user.can_be_deleted? && (@current_user != user) %>
64
58
  </td>
65
59
  <% end %>
66
60
 
67
61
  <% if display_edit_links? %>
68
- <td class="action-links" style="width:15%">
62
+ <td class="action-links hidden-xs hidden-sm" style="width:15%">
69
63
 
70
64
  <!-- Approve -->
71
65
  <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Approve"), update_status_user_path(:id =>user.id, :status =>'approved'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_approved? && (@current_user != user) %>
@@ -77,6 +71,6 @@
77
71
  <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Suspend"), update_status_user_path(:id =>user.id, :status =>'suspended'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_suspended? && (@current_user != user) %>
78
72
  </td>
79
73
  <% end %>
80
-
74
+
81
75
  </tr>
82
76
 
data/app/views/usman/users/_show.html.erb CHANGED
@@ -80,217 +80,128 @@
80
80
 
81
81
  </div>
82
82
  <% end %>
83
-
84
83
  </div>
85
84
 
86
- <%= clear_tag(50) %>
87
-
88
- <ul class="nav nav-pills">
89
- <li class="active">
90
- <a href="#profile_info" data-toggle="tab" aria-expanded="true">
91
- <span class="visible-xs"><i class="fa-info"></i></span>
92
- <span class="hidden-xs">Profile Info</span>
93
- </a>
94
- </li>
95
-
96
- <li class="">
97
- <a href="#registration_info" data-toggle="tab" aria-expanded="true">
98
- <span class="visible-xs"><i class="fa-info"></i></span>
99
- <span class="hidden-xs">Registration Info</span>
100
- </a>
101
- </li>
102
-
103
- <% if @current_user.super_admin? %>
104
- <li class="">
105
- <a href="#technical_details" data-toggle="tab" aria-expanded="false">
106
- <span class="visible-xs"><i class="fa-database"></i></span>
107
- <span class="hidden-xs">Technical Details</span>
108
- </a>
109
- </li>
110
- <% end %>
111
- </ul>
85
+ <%= clear_tag(30) %>
86
+
87
+ <div><strong class="fs-18">Profile Info</strong></div>
88
+ <hr>
89
+ <div class="table-responsive mt-30">
90
+ <table class="table table-striped table-condensed table-bordered">
91
+ <tbody>
92
+
93
+ <tr><th>Name</th><td><%= @user.name %></td></tr>
94
+ <tr><th>Username</th><td><%= @user.username %></td></tr>
95
+
96
+ <tr><th>Email</th><td><%= @user.email %></td></tr>
97
+ <tr><th>Phone</th><td><%= @user.phone %></td></tr>
98
+
99
+ <tr><th>City</th><td><%= @user.city.try(:display_name) %></td></tr>
100
+ <tr><th>Country</th><td><%= @user.country.try(:display_name) %></td></tr>
101
+
102
+ <tr><th>Gender</th><td><%= @user.gender %></td></tr>
103
+ <tr><th>Date of Birth</th><td><%= @user.date_of_birth.strftime("%m/%d/%Y") if @user.date_of_birth %></td></tr>
104
+
105
+ <tr><th>Designation</th><td><%= @user.designation %></td></tr>
106
+ <tr><th>Status</th><td>
107
+ <% if @user.pending? %>
108
+ <span class="label label-default">Pending</span>
109
+ <% elsif @user.approved? %>
110
+ <span class="label label-success">Approved</span>
111
+ <% elsif @user.suspended? %>
112
+ <span class="label label-danger">Suspended</span>
113
+ <% end %>
114
+ </td>
115
+ </tr>
116
+
117
+ <% if @current_user.super_admin? %>
118
+ <tr><th>Dummy?</th><td><%= @user.dummy.to_s.titleize %></td></tr>
119
+ <tr><th>Super Admin</th><td><%= @user.super_admin?.to_s.titleize %></td></tr>
120
+ <% end %>
121
+
122
+ </tbody>
123
+ </table>
124
+ </div>
112
125
 
113
- <div class="tab-content">
114
- <div class="tab-pane active" id="profile_info" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;">
115
-
116
- <%= clear_tag(20) %>
117
- <div class="table-responsive mt-30">
118
- <table class="table table-striped table-condensed table-bordered">
119
- <tbody>
120
-
121
- <tr>
122
- <th>Name</th><td><%= @user.name %></td>
123
- <th>Username</th><td><%= @user.username %></td>
124
- </tr>
125
-
126
- <tr>
127
- <th>Email</th><td><%= @user.email %></td>
128
- <th>Phone</th><td><%= @user.phone %></td>
129
- </tr>
130
-
131
- <tr>
132
- <th>City</th><td><%= @user.city.try(:display_name) %></td>
133
- <th>Country</th><td><%= @user.country.try(:display_name) %></td>
134
- </tr>
135
-
136
- <tr>
137
- <th>Gender</th><td><%= @user.gender %></td>
138
- <th>Date of Birth</th><td><%= @user.date_of_birth.strftime("%m/%d/%Y") if @user.date_of_birth %></td>
139
- </tr>
140
-
141
- <tr>
142
- <th>Designation</th><td><%= @user.designation %></td>
143
- <th>Status</th><td>
144
- <% if @user.pending? %>
145
- <span class="label label-default">Pending</span>
146
- <% elsif @user.approved? %>
147
- <span class="label label-success">Approved</span>
148
- <% elsif @user.suspended? %>
149
- <span class="label label-danger">Suspended</span>
150
- <% end %>
151
- </td>
152
- </tr>
153
-
154
- <% if @current_user.super_admin? %>
155
- <tr>
156
- <th>Dummy?</th><td><%= @user.dummy.to_s.titleize %></td>
157
- <th>Super Admin</th><td><%= @user.super_admin?.to_s.titleize %></td>
158
- </tr>
126
+ <% if @registration %>
127
+ <div><strong class="fs-18">Mobile Registration Info</strong></div>
128
+ <hr>
129
+ <div class="table-responsive mt-30">
130
+ <table class="table table-striped table-condensed table-bordered">
131
+ <tbody>
132
+
133
+ <tr><th>ID</th><td><%= @registration.id %></td></tr>
134
+ <tr><th>User / Profile ID</th><td><%= @registration.user_id %></td></tr>
135
+
136
+ <tr><th>Status</th>
137
+ <td><% if @registration.pending? %>
138
+ <span class="label label-default">Pending</span>
139
+ <% elsif @registration.verified? %>
140
+ <span class="label label-success">Verified</span>
141
+ <% elsif @registration.suspended? %>
142
+ <span class="label label-danger">Suspended</span>
159
143
  <% end %>
160
-
161
- </tbody>
162
- </table>
163
- </div>
144
+ </td></tr>
145
+
146
+ <tr><th>Country</th><td><%= @registration.country.try(:display_name) %></td></tr>
147
+ <tr><th>City</th><td><%= @registration.city.try(:display_name) %></td></tr>
148
+
149
+ <tr><th>Dialing Prefix</th><td><%= @registration.dialing_prefix %></td></tr>
150
+ <tr><th>Mobile Number</th><td><%= @registration.mobile_number %></td></tr>
151
+
152
+ <tr><th>Created At</th><td><%= @registration.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @registration.created_at %></td></tr>
153
+ <tr><th>Updated At</th><td><%= @registration.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @registration.updated_at %></td></tr>
154
+
155
+ </tbody>
156
+ </table>
157
+ </div>
158
+ <% end %>
164
159
 
165
- </div>
160
+ <% if @current_user.super_admin? %>
161
+ <div><strong class="fs-18">Technical Details</strong></div>
162
+ <hr>
163
+ <div class="table-responsive">
164
+ <table class="table table-striped table-condensed table-bordered mb-30">
165
+ <tbody>
166
+
167
+ <tr><th>Super Admin?</th><td><%= @user.super_admin.to_s.upcase %></td></tr>
168
+ <tr><th>Status</th><td><%= @user.status.titleize %></td></tr>
166
169
 
167
- <div class="tab-pane" id="registration_info" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;">
168
-
169
- <%= clear_tag(20) %>
170
-
171
- <% if @registration %>
172
-
173
- <div class="table-responsive mt-30">
174
- <table class="table table-striped table-condensed table-bordered">
175
- <tbody>
176
-
177
- <tr>
178
- <th>ID</th><td><%= @registration.id %></td>
179
- <th>User / Profile ID</th><td><%= @registration.user_id %></td>
180
- </tr>
181
-
182
- <tr>
183
- <th>Status</th><td>
184
- <% if @registration.pending? %>
185
- <span class="label label-default">Pending</span>
186
- <% elsif @registration.verified? %>
187
- <span class="label label-success">Verified</span>
188
- <% elsif @registration.suspended? %>
189
- <span class="label label-danger">Suspended</span>
190
- <% end %>
191
- </td>
192
- <th></th><td></td>
193
- </tr>
194
-
195
- <tr>
196
- <th>Country</th><td><%= @registration.country.try(:display_name) %></td>
197
- <th>City</th><td><%= @registration.city.try(:display_name) %></td>
198
- </tr>
199
-
200
- <tr>
201
- <th>Dialing Prefix</th><td><%= @registration.dialing_prefix %></td>
202
- <th>Mobile Number</th><td><%= @registration.mobile_number %></td>
203
- </tr>
204
-
205
- <tr>
206
- <th>Created At</th><td><%= @registration.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @registration.created_at %></td>
207
- <th>Updated At</th><td><%= @registration.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @registration.updated_at %></td>
208
- </tr>
209
-
210
- </tbody>
211
- </table>
212
- </div>
213
-
214
- <% end %>
215
-
216
- </div>
217
-
218
- <% if @current_user.super_admin? %>
219
- <div class="tab-pane" id="technical_details" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;">
220
-
221
- <%= clear_tag(20) %>
222
-
223
- <div class="table-responsive">
224
- <table class="table table-striped table-condensed table-bordered mb-30">
225
- <tbody>
226
-
227
- <tr>
228
- <th>Super Admin?</th><td><%= @user.super_admin.to_s.upcase %></td>
229
- <th>Status</th><td><%= @user.status.titleize %></td>
230
- </tr>
231
-
232
- <tr>
233
- <th style="width:20%;">Sign In Count</th><td style="width:30%;"><%= @user.sign_in_count %></td>
234
- <th style="width:20%;">Remember User</th><td style="width:30%;"><%= @user.remember_created_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.remember_created_at %></td>
235
- </tr>
236
-
237
- <tr>
238
- <th>Current Sign In At</th><td><%= @user.current_sign_in_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.current_sign_in_at %></td>
239
- <th>Last Sign In At</th><td><%= @user.last_sign_in_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.last_sign_in_at %></td>
240
- </tr>
241
-
242
- <tr>
243
- <th>Current Sign In IP</th><td><%= @user.current_sign_in_ip %></td>
244
- <th>Last Sign In IP</th><td><%= @user.last_sign_in_ip %></td>
245
- </tr>
246
-
247
- </tbody>
248
- </table>
249
-
250
- <table class="table table-striped table-condensed table-bordered">
251
- <tbody>
252
-
253
- <tr>
254
- <th style="width:20%;">Reset Password Token</th><td style="width:30%;"><%= @user.reset_password_token %></td>
255
- <th style="width:20%;">Reset Password Sent At</th><td style="width:30%;"><%= @user.reset_password_sent_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.reset_password_sent_at %></td>
256
- </tr>
257
-
258
- <tr>
259
- <th>Locked At</th><td colspan="3"><%= @user.locked_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.locked_at %></td>
260
- </tr>
261
-
262
- <tr>
263
- <th>Failed Attempts</th><td><%= @user.failed_attempts %></td>
264
- <th>Unlock Token</th><td><%= @user.unlock_token %></td>
265
- </tr>
266
-
267
- <tr>
268
- <th>Confirmation Token</th><td><%= @user.confirmation_token %></td>
269
- <th>Confirmation Token Sent At</th><td><%= @user.confirmed_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.confirmed_at %></td>
270
- </tr>
271
-
272
- <tr>
273
- <th>Confirmation Sent At</th><td><%= @user.confirmation_sent_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.confirmation_sent_at %></td>
274
- <th>Uncomfirmed Email</th><td><%= @user.unconfirmed_email %></td>
275
- </tr>
276
-
277
- <tr>
278
- <th>Auth Token</th><td><%= @user.auth_token %></td>
279
- <th>Token Created At</th><td><%= @user.token_created_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.token_created_at %></td>
280
- </tr>
281
-
282
- <tr>
283
- <th>Created At</th><td><%= @user.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.created_at %></td>
284
- <th>Updated At</th><td><%= @user.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.updated_at %></td>
285
- </tr>
286
-
287
- </tbody>
288
- </table>
289
- </div>
290
- </div>
291
- <% end %>
170
+ <tr><th style="width:20%;">Sign In Count</th><td style="width:30%;"><%= @user.sign_in_count %></td></tr>
171
+ <tr><th style="width:20%;">Remember User</th><td style="width:30%;"><%= @user.remember_created_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.remember_created_at %></td></tr>
292
172
 
173
+ <tr><th>Current Sign In At</th><td><%= @user.current_sign_in_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.current_sign_in_at %></td></tr>
174
+ <tr><th>Last Sign In At</th><td><%= @user.last_sign_in_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.last_sign_in_at %></td></tr>
175
+
176
+ <tr><th>Current Sign In IP</th><td><%= @user.current_sign_in_ip %></td></tr>
177
+ <tr><th>Last Sign In IP</th><td><%= @user.last_sign_in_ip %></td></tr>
178
+
179
+ <tr><th style="width:20%;">Reset Password Token</th><td style="width:30%;"><%= @user.reset_password_token %></td></tr>
180
+ <tr><th style="width:20%;">Reset Password Sent At</th><td style="width:30%;"><%= @user.reset_password_sent_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.reset_password_sent_at %></td></tr>
181
+
182
+ <tr><th>Locked At</th><td colspan="3"><%= @user.locked_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.locked_at %></td>
183
+ </tr>
184
+
185
+ <tr><th>Failed Attempts</th><td><%= @user.failed_attempts %></td></tr>
186
+ <tr><th>Unlock Token</th><td><%= @user.unlock_token %></td></tr>
187
+
188
+ <tr><th>Confirmation Token</th><td><%= @user.confirmation_token %></td></tr>
189
+ <tr><th>Confirmation Token Sent At</th><td><%= @user.confirmed_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.confirmed_at %></td></tr>
190
+
191
+ <tr><th>Confirmation Sent At</th><td><%= @user.confirmation_sent_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.confirmation_sent_at %></td></tr>
192
+ <tr><th>Uncomfirmed Email</th><td><%= @user.unconfirmed_email %></td>
193
+
194
+ <tr><th>Auth Token</th><td><%= @user.auth_token %></td></tr>
195
+ <tr><th>Token Created At</th><td><%= @user.token_created_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.token_created_at %></td></tr>
196
+
197
+ <tr><th>Created At</th><td><%= @user.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.created_at %></td></tr>
198
+ <tr><th>Updated At</th><td><%= @user.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.updated_at %></td></tr>
199
+
200
+ </tbody>
201
+ </table>
293
202
  </div>
203
+ <% end %>
204
+
294
205
 
295
206
  <%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right" %>
296
207
 
data/config/routes.rb CHANGED
@@ -38,6 +38,7 @@ Usman::Engine.routes.draw do
38
38
 
39
39
  resources :features do
40
40
  member do
41
+ put :update_permission, as: :update_permission
41
42
  put :update_status, as: :update_status
42
43
  end
43
44
  end
data/lib/usman/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Usman
2
- VERSION = '0.3.33'
2
+ VERSION = '0.3.34'
3
3
  end