👕 inp.required fix + added test to repeatables

punchcard-cms · Sep 23, 2016 · 931b593 · 931b593
1 parent ad05279
commit 931b593
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/form/html.js b/lib/form/html.js
@@ -90,6 +90,7 @@ const addRequired = (html, input, index) => {
 
     if (input.required === 'save' || inp.required === 'save' || input.required === 'publish' || inp.required === 'publish') {
       let level = '';
+      const required = input.required && inp.required;
       if (inp.required !== undefined) {
         level += `required--${inp.required}`;
       }
@@ -140,7 +141,7 @@ const addRequired = (html, input, index) => {
 
       // Add required text to label
       const reLabel = new RegExp('</label>');
-      render = render.replace(reLabel, `<mark class="mark-${input.required}">required to ${input.required}</mark></label>`);
+      render = render.replace(reLabel, `<mark class="mark-${required}">required to ${required}</mark></label>`);
     }
   });
 

diff --git a/tests/html.js b/tests/html.js
@@ -41,7 +41,7 @@ test('Add Errors Repeatable - Pass', t => {
     },
     input: {
       description: 'An email input with domain validation',
-      html: '<label for=\'{{email.id}}\'>{{email.label}}</label><input type=\'{{email.type}}\' id=\'{{email.id}}\' name=\'{{email.name}}\' value=\'{{email.value}}\' placeholder=\'{{email.placeholder}}\' />',
+      html: '<label for=\'{{email.id}}\'>{{email.label}} <mark class=\'mark-{{textarea.required}}\'>required to {{textarea.required}}</mark></label><input type=\'{{email.type}}\' id=\'{{email.id}}\' name=\'{{email.name}}\' value=\'{{email.value}}\' placeholder=\'{{email.placeholder}}\' />',
       id: 'my-email',
       inputs: [
         {