Merge pull request #5293 from AntonKhorev/user-roles-resourceful-routes

[rails.git] / app / views / user_blocks / edit.html.erb

diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb
index 2d8956ffca730f29c1498074e05110c3a681ca48..14480eac8bc69fa8e58fb901b77b8b1076b994de 100644 (file)
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -9,7 +9,7 @@
 <%= bootstrap_form_for(@user_block) do |f| %>
   <%= f.richtext_field :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
 
 <%= bootstrap_form_for(@user_block) do |f| %>
   <%= f.richtext_field :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
 

-  <% if @user_block.active? %>
+  <% if @user_block.active? && @user_block.creator == current_user %>

     <%= f.form_group do %>
       <%= label_tag "user_block_period", t(".period"), :class => "form-label" %>
       <%= select_tag "user_block_period",
     <%= f.form_group do %>
       <%= label_tag "user_block_period", t(".period"), :class => "form-label" %>
       <%= select_tag "user_block_period",


@@ -21,14 +21,24 @@
     <%= f.form_group :needs_view do %>
       <%= f.check_box :needs_view %>
     <% end %>
     <%= f.form_group :needs_view do %>
       <%= f.check_box :needs_view %>
     <% end %>

+
+    <%= f.primary %>

   <% else %>
     <div class="alert alert-info">
   <% else %>
     <div class="alert alert-info">

-      <%= t "user_blocks.update.inactive_block_cannot_be_reactivated" %>
+      <% if @user_block.active? %>
+        <%= t "user_blocks.update.only_creator_can_edit_without_revoking" %>
+      <% else %>
+        <%= t "user_blocks.update.inactive_block_cannot_be_reactivated" %>
+      <% end %>

     </div>
 
     <%= hidden_field_tag "user_block_period", 0 %>
     </div>
 
     <%= hidden_field_tag "user_block_period", 0 %>

-    <%= f.hidden_field :needs_view %>
-  <% end %>
+    <%= hidden_field_tag "user_block[needs_view]", false %>

 
 

-  <%= f.primary %>
+    <% if @user_block.active? %>
+      <%= f.submit t(".revoke"), :class => "btn btn-danger" %>
+    <% else %>
+      <%= f.primary %>
+    <% end %>
+  <% end %>

 <% end %>
 <% end %>