Merge pull request #439 from sydoluciani/deform_updating_error_class

Deform updating error_class
Pylons · Aug 21, 2020 · d9fa170 · d9fa170
2 parents 366355c + 023746a
commit d9fa170
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/deform/templates/mapping_item.pt b/deform/templates/mapping_item.pt
@@ -6,7 +6,7 @@
                  category category|field.widget.category;
                  structural hidden or category == 'structural';
                  required required|field.required;"
-     class="form-group ${field.error and 'has-error' or ''} ${field.widget.item_css_class or ''} ${field.default_item_css_class()}"
+     class="form-group ${field.error and error_class or ''} ${field.widget.item_css_class or ''} ${field.default_item_css_class()}"
      title="${description}"
      id="item-${oid}"
      tal:omit-tag="structural"
@@ -31,7 +31,7 @@
             tal:condition="input_append">${input_append}</span>
   </div>
 
-  <p class="help-block"
+  <p class="form-text text-danger"
      tal:define="errstr 'error-%s' % field.oid"
      tal:repeat="msg field.error.messages()"
      i18n:translate=""
@@ -42,7 +42,7 @@
   </p>
 
   <p tal:condition="field.description and not field.widget.hidden"
-     class="help-block" >
+     class="form-text" >
     ${field.description}
   </p>
 </div>
diff --git a/deform/templates/readonly/mapping_item.pt b/deform/templates/readonly/mapping_item.pt
@@ -6,7 +6,7 @@
                  category category|field.widget.category;
                  structural hidden or category == 'structural';
                  required required|field.required;"
-     class="form-group ${field.error and 'has-error' or ''} ${field.widget.item_css_class or ''}"
+     class="form-group ${field.error and error_class or ''} ${field.widget.item_css_class or ''}"
      title="${description}"
      id="item-${oid}"
      tal:omit-tag="structural"
@@ -31,7 +31,7 @@
             tal:condition="input_append">${input_append}</span>
   </div>
 
-  <p class="help-block"
+  <p class="form-text text-danger"
      tal:define="errstr 'error-%s' % field.oid"
      tal:repeat="msg field.error.messages()"
      i18n:translate=""
@@ -42,7 +42,7 @@
   </p>
 
   <p tal:condition="field.description and not field.widget.hidden"
-     class="help-block" >
+     class="form-text" >
     ${field.description}
   </p>
 </div>
diff --git a/deform/templates/sequence_item.pt b/deform/templates/sequence_item.pt
@@ -14,7 +14,7 @@
                 repeat="msg field.error.messages()">
       <p tal:condition="msg"
          id="${errstr if repeat.msg.index==0 else '%s-%s' % (errstr, repeat.msg.index)}"
-         class="${error_class} help-block"
+         class="${error_class} form-text text-danger"
          i18n:translate="">${msg}</p>
     </tal:errors>
   </div>

diff --git a/deform/templates/textinput.pt b/deform/templates/textinput.pt
@@ -1,13 +1,14 @@
 <span tal:define="name name|field.name;
                   css_class css_class|field.widget.css_class;
+                  error_class error_class|field.widget.error_class;
                   oid oid|field.oid;
                   mask mask|field.widget.mask;
                   mask_placeholder mask_placeholder|field.widget.mask_placeholder;
                   style style|field.widget.style;
                   autofocus autofocus|field.autofocus"
       tal:omit-tag="">
     <input type="text" name="${name}" value="${cstruct}"
-           tal:attributes="class string: form-control ${css_class or ''};
+           tal:attributes="class string: form-control ${field.error and error_class or css_class or ''};
                            style style;
                            autofocus autofocus;
                            attributes|field.widget.attributes|{};"

diff --git a/deform/widget.py b/deform/widget.py
@@ -172,7 +172,7 @@ class Widget(object):
     hidden = False
     readonly = False
     category = "default"
-    error_class = "error"
+    error_class = "is-invalid"
     css_class = None
     item_css_class = None
     style = None
@@ -1409,7 +1409,7 @@ class MappingWidget(Widget):
     readonly_template = "readonly/mapping"
     item_template = "mapping_item"
     readonly_item_template = "readonly/mapping_item"
-    error_class = None
+    error_class = "is-invalid"
     category = "structural"
     requirements = (("deform", None),)
 
@@ -1539,7 +1539,7 @@ class SequenceWidget(Widget):
     readonly_template = "readonly/sequence"
     item_template = "sequence_item"
     readonly_item_template = "readonly/sequence_item"
-    error_class = None
+    error_class = "is-invalid"
     add_subitem_text_template = _("Add ${subitem_title}")
     min_len = None
     max_len = None