Merge pull request #284 from biosistemika/zd_SCI_662

fixes description label [fixes SCI-662]
This commit is contained in:
Zmago Devetak 2016-11-16 14:16:57 +01:00 committed by GitHub
commit d3234bc52f
2 changed files with 2 additions and 1 deletions

View file

@ -27,6 +27,7 @@
<div class="tab-pane active" role="tabpanel" id="new-step-main">
<%= f.text_field :name, label: t("protocols.steps.new.name"), placeholder: t("protocols.steps.new.name_placeholder") %>
<div class="form-group">
<label class="control-label" for="step_description"><%= t('protocols.steps.new.description') %></label>
<%= quill_editor nil, { id: 'step_description', name: 'step[description]', value: @step.description } %>
</div>
</div>

View file

@ -32,7 +32,7 @@
<div class="panel-collapse collapse" id="step-panel-<%= step.id %>" role="tabpanel">
<div class="panel-body">
<div class="row">
<% if step.description.blank? %>
<% if strip_tags(step.description).blank? %>
<em><%= t("protocols.steps.no_description") %></em>
<% else %>
<%= step.description.html_safe %>