Przeglądaj źródła

Merge branch 'multistep_webforms' of github.com:hrwx/frappe into multistep_webforms

version-14
hrwx 3 lat temu
rodzic
commit
541740cb18
2 zmienionych plików z 6 dodań i 6 usunięć
  1. +2
    -2
      cypress/integration/web_form.js
  2. +4
    -4
      frappe/public/js/frappe/web_form/web_form.js

+ 2
- 2
cypress/integration/web_form.js Wyświetl plik

@@ -1,6 +1,6 @@
context('Web Form', () => {
before(() => {
cy.login('Administrator', 'frappe')
cy.login();
});

it('Navigate and Submit a WebForm', () => {
@@ -12,7 +12,7 @@ context('Web Form', () => {
});

it('Timeline should have submit and cancel activity information', () => {
cy.call('frappe.tests.ui_test_helpers.update_webform_to_multistep').then(r => {
cy.call('frappe.tests.ui_test_helpers.update_webform_to_multistep').then(() => {
cy.visit('/update-profile');
cy.get_field('last_name', 'Data').type('_Test User', {force: true}).wait(200);
cy.get('.btn-next').should('be.visible');


+ 4
- 4
frappe/public/js/frappe/web_form/web_form.js Wyświetl plik

@@ -90,12 +90,12 @@ export default class WebForm extends frappe.ui.FieldGroup {

if (!is_validated) return;

for (let idx = me.current_section; idx < me.sections.length; idx--) {
for (let idx = me.current_section; idx < me.sections.length; idx--) { // eslint-disable-line no-console
let is_empty = me.is_previous_section_empty(idx);
me.current_section = me.current_section > 0 ? me.current_section - 1 : me.current_section;

if (!is_empty) {
break
break;
}
}
me.toggle_section();
@@ -111,7 +111,7 @@ export default class WebForm extends frappe.ui.FieldGroup {
me.current_section = me.current_section < me.sections.length ? me.current_section + 1 : me.current_section;

if (!is_empty) {
break
break;
}
}
me.toggle_section();
@@ -186,7 +186,7 @@ export default class WebForm extends frappe.ui.FieldGroup {
if (this.allow_incomplete) return true;

let fields = $(`.form-section:eq(${this.current_section}) .form-control`);
let errors = []
let errors = [];

for (let field of fields) {
let fieldname = $(field).attr("data-fieldname");


Ładowanie…
Anuluj
Zapisz