Merge pull request #290 from mlorb/ml_sci_669

add validation for result text field [SCI-669]
This commit is contained in:
mlorb 2016-11-15 13:09:37 +01:00 committed by GitHub
commit 59952e400c
2 changed files with 8 additions and 4 deletions

View file

@ -2,8 +2,10 @@
<%= bootstrap_form_for(@result, url: result_text_path(format: :json), remote: :true) do |f| %>
<%= f.text_field :name, style: "margin-top: 10px;" %><br />
<%= f.fields_for :result_text do |ff| %>
<%= quill_editor nil, { name: 'result[result_text_attributes][text]', value: @result.result_text.text } %><br />
<% end %>
<div class="form-group">
<%= quill_editor nil, { id: 'result_result_text_attributes_text', name: 'result[result_text_attributes][text]', value: @result.result_text.text } %>
</div>
<% end %><br />
<%= f.submit t("result_texts.edit.update"), class: 'btn btn-primary save-result', onclick: "processResult(event, ResultTypeEnum.TEXT, true);" %>
<button type="button" class="btn btn-default cancel-edit">
<%= t("general.cancel")%>

View file

@ -2,8 +2,10 @@
<%= bootstrap_form_for(@result, url: my_module_result_texts_path(format: :json), remote: true) do |f| %>
<%= f.text_field :name, style: "margin-top: 10px;" %><br />
<%= f.fields_for :result_text do |ff| %>
<%= quill_editor nil, { name: 'result[result_text_attributes][text]', value: @result.result_text.text } %><br />
<% end %>
<div class="form-group">
<%= quill_editor nil, { id: 'result_result_text_attributes_text', name: 'result[result_text_attributes][text]', value: @result.result_text.text } %>
</div>
<% end %><br />
<%= f.submit t("result_texts.new.create"), class: 'btn btn-primary save-result', onclick: "processResult(event, ResultTypeEnum.TEXT, false);" %>
<button type="button" class="btn btn-default cancel-new">
<%= t("general.cancel")%>