Merge remote-tracking branch 'upstream/pull/5092'

[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 db7c5e057f360d5c80ceab91cdbfee6e4fe86589..2d8956ffca730f29c1498074e05110c3a681ca48 100644 (file)
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,28 +1,33 @@
 <% @title = t ".title", :name => @user_block.user.display_name %>
 <% @title = t ".title", :name => @user_block.user.display_name %>

+
+<% content_for :heading_class, "pb-0" %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t(".heading_html",
-            :name => link_to(@user_block.user.display_name,
-                             user_path(@user_block.user))) %></h1>
-  <nav class='secondary-actions'>
-    <ul class='clearfix'>
-      <li><%= link_to t(".show"), @user_block %></li>
-      <li><%= link_to t(".back"), user_blocks_path %></li>
-    </ul>
-  </nav>
+  <h1><%= t(".heading_html", :name => link_to(@user_block.user.display_name, @user_block.user)) %></h1>
+  <%= render :partial => "navigation" %>

 <% end %>
 
 <%= bootstrap_form_for(@user_block) do |f| %>
   <%= f.richtext_field :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
 
 <% end %>
 
 <%= bootstrap_form_for(@user_block) do |f| %>
   <%= f.richtext_field :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
 

-  <%= f.form_group do %>
-    <%= label_tag "user_block_period", t(".period"), :class => "form-label" %>
-    <%= select_tag("user_block_period",
-                   options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] }, params[:user_block_period]),
-                   :class => "form-select") %>
-  <% end %>
+  <% if @user_block.active? %>
+    <%= f.form_group do %>
+      <%= label_tag "user_block_period", t(".period"), :class => "form-label" %>
+      <%= select_tag "user_block_period",
+                     options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] },
+                                        UserBlock::PERIODS.min_by { |h| (params[:user_block_period].to_i - h).abs }),
+                     :class => "form-select" %>
+    <% end %>
+
+    <%= f.form_group :needs_view do %>
+      <%= f.check_box :needs_view %>
+    <% end %>
+  <% else %>
+    <div class="alert alert-info">
+      <%= t "user_blocks.update.inactive_block_cannot_be_reactivated" %>
+    </div>

 
 

-  <%= f.form_group :needs_view do %>
-    <%= f.check_box :needs_view %>
+    <%= hidden_field_tag "user_block_period", 0 %>
+    <%= f.hidden_field :needs_view %>

   <% end %>
 
   <%= f.primary %>
   <% end %>
 
   <%= f.primary %>