scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-02 09:54:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #279 from mlorb/ml_sci_638_vol2

Browse source 
Fix validation problems for rich text fields [SCI-638]
This commit is contained in:
mlorb 2016-11-11 12:37:02 +01:00 • committed by GitHub
commit b0b2484fdf
6 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/sitewide/form_validators.js.erb
View file

@ -27,6 +27,9 @@ function textValidator(ev, textInput, textLimitMin, textLimitMax, clearErr) {
var text = $(textInput).val().trim();
$(textInput).val(text);
var text_from_html = $("<div/>").html(text).text();
if (text_from_html.length < text.length) text = text_from_html;
var nameTooShort = text.length < textLimitMin;
var nameTooLong = text.length > textLimitMax;

7
app/assets/stylesheets/themes/scinote.scss
View file

@ -428,6 +428,13 @@ a[data-toggle="tooltip"] {
}
}
.has-error {
.ql-container.ql-snow,
.ql-toolbar.ql-snow {
border: 1px solid $color-apple-blossom;
}
}
.nav-tabs-less {
margin-bottom: 0;
}

2
app/models/result_text.rb
View file

@ -2,7 +2,7 @@ class ResultText < ActiveRecord::Base
auto_strip_attributes :text, nullify: false
validates :text,
presence: true,
length: { maximum: Constants::TEXT_MAX_LENGTH }
length: { maximum: Constants::RICH_TEXT_MAX_LENGTH }
validates :result, presence: true
belongs_to :result, inverse_of: :result_text

2
app/models/step.rb
View file

@ -5,7 +5,7 @@ class Step < ActiveRecord::Base
validates :name,
presence: true,
length: { maximum: Constants::NAME_MAX_LENGTH }
validates :description, length: { maximum: Constants::TEXT_MAX_LENGTH }
validates :description, length: { maximum: Constants::RICH_TEXT_MAX_LENGTH }
validates :position, presence: true
validates :completed, inclusion: { in: [true, false] }
validates :user, :protocol, presence: true

4
app/views/steps/_empty_step.html.erb
View file

@ -26,7 +26,9 @@
<div class="tab-content">
<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") %>
<%= quill_editor nil, { name: 'step[description]', value: @step.description } %>
<div class="form-group">
<%= quill_editor nil, { id: 'step_description', name: 'step[description]', value: @step.description } %>
</div>
</div>
<div class="tab-pane" role="tabpanel" id="new-step-checklists">
<%= f.nested_fields_for :checklists do |ff| %>

2
config/initializers/constants.rb
View file

@ -11,6 +11,8 @@ class Constants
NAME_TRUNCATION_LENGTH = 25
# Max characters for long text fields
TEXT_MAX_LENGTH = 10000
# Max characters for rich text fields (in html format)
RICH_TEXT_MAX_LENGTH = 50000
# Max characters for color field (given in HEX format)
COLOR_MAX_LENGTH = 7
# Max characters for text in dropdown list element