Merge pull request #2727 from floriank/fix/19245-options-sticky-and-locked

[Forums] Only allow the setting of sticky and locked while not replying
pull/2730/head
ulferts 10 years ago
commit e4821c6486
  1. 14
      app/views/messages/_form.html.erb

@ -31,12 +31,14 @@ See doc/COPYRIGHT.rdoc for more details.
<div class="form--field">
<%= f.text_field :subject, required: true %>
</div>
<div class="form--field">
<%= f.check_box :sticky, label: l(:label_board_sticky) %>
</div>
<div class="form--field">
<%= f.check_box :locked, label: l(:label_board_locked) %>
</div>
<% unless replying %>
<div class="form--field">
<%= f.check_box :sticky, label: l(:label_board_sticky) %>
</div>
<div class="form--field">
<%= f.check_box :locked, label: l(:label_board_locked) %>
</div>
<% end %>
<% if !replying && !@message.new_record? && User.current.allowed_to?(:edit_messages, @project) %>
<div class="form--field">
<%= f.select :board_id, @project.boards.collect {|b| [b.name, b.id]}, label: Board.name.humanize %>

Loading…
Cancel
Save