user can't delete self and flash_messages
This commit is contained in:
1 parent
318c264cae
commit
e62df90117
9 files changed
+67
-16
No files matched your search
@@ -12,6 +12,8 @@
|
||||
</ul>
|
||||
<% end -%>
|
||||
|
||||
<%= flash_messages %>
|
||||
|
||||
<h1><%= t('admin.list_items') %>: <%= show_parent_items_link unless @parent_item.nil? %></h1>
|
||||
|
||||
<% if !Layout.exist_one? %>
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
</ul>
|
||||
<% end -%>
|
||||
|
||||
<%= flash_messages %>
|
||||
|
||||
<h1><%= t('admin.list_layouts') %></h1>
|
||||
|
||||
<table>
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
</fieldset>
|
||||
<% end %>
|
||||
|
||||
<%= hidden_field_tag :active_roles, @user.active_roles.size > 0 %>
|
||||
<%= hidden_field_tag :active_roles, (@user.active_roles.size > 0 rescue nil ) %>
|
||||
<% if @user_role_models %>
|
||||
<fieldset id="roles" <%= raw(' style="display: none;"') unless (@user.active_roles.size > 0 rescue nil) %>>
|
||||
<legend><%= t('panel.roles') %></legend>
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
<% content_for :secondary do %>
|
||||
<ul class="list">
|
||||
<li><%= link_to t('panel.new_user'), new_panel_user_path, :class => 'button positive' %></li>
|
||||
</ul>
|
||||
<ul class="list">
|
||||
<li><%= link_to t('panel.new_user'), new_panel_user_path, :class => 'button positive' %></li>
|
||||
</ul>
|
||||
<% end -%>
|
||||
|
||||
<%= flash_messages %>
|
||||
|
||||
<h1><%= t('panel.list_users') %></h1>
|
||||
|
||||
<table>
|
||||
@@ -14,15 +16,16 @@
|
||||
<th><%= t('panel.action') %></th>
|
||||
</tr>
|
||||
|
||||
<% @users.each do |user| %>
|
||||
<tr>
|
||||
<td><%= user.get_roles %></td>
|
||||
<td><%= user[:name] %></td>
|
||||
<td><%= user.email %></td>
|
||||
<td>
|
||||
<% @users.each do |user| %>
|
||||
<tr>
|
||||
<td><%= user.get_roles %></td>
|
||||
<td><%= user[:name] %></td>
|
||||
<td><%= user.email %></td>
|
||||
<td>
|
||||
<%= link_to t(:show), panel_user_path(user) %> |
|
||||
<%= link_to t(:edit), edit_panel_user_path(user) %> |
|
||||
<%= link_to t(:delete), panel_user_path(user), :method => :delete %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<%= link_to t(:delete), panel_user_path(user), :confirm => t('sure?'), :method => :delete %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</table>
|
||||
Reference in new issue
Block a user