diff --git a/db/changes/225001/.gitkeep b/db/changes/225001/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/db/changes/225001/00-entryDeleteRef.sql b/db/changes/225201/00-entryDeleteRef.sql similarity index 100% rename from db/changes/225001/00-entryDeleteRef.sql rename to db/changes/225201/00-entryDeleteRef.sql diff --git a/db/changes/225001/00-invoiceInConfig.sql b/db/changes/225201/00-invoiceInConfig.sql similarity index 100% rename from db/changes/225001/00-invoiceInConfig.sql rename to db/changes/225201/00-invoiceInConfig.sql diff --git a/db/changes/225001/00-supplier_beforeUpdate.sql b/db/changes/225201/00-supplier_beforeUpdate.sql similarity index 100% rename from db/changes/225001/00-supplier_beforeUpdate.sql rename to db/changes/225201/00-supplier_beforeUpdate.sql diff --git a/db/changes/225001/01-modules.sql b/db/changes/225201/01-modules.sql similarity index 100% rename from db/changes/225001/01-modules.sql rename to db/changes/225201/01-modules.sql diff --git a/db/changes/225001/02-starredModule.sql b/db/changes/225201/02-starredModule.sql similarity index 100% rename from db/changes/225001/02-starredModule.sql rename to db/changes/225201/02-starredModule.sql diff --git a/e2e/paths/01-salix/04_recoverPassword.spec.js b/e2e/paths/01-salix/04_recoverPassword.spec.js index 80ef32cb5..67e6362d3 100644 --- a/e2e/paths/01-salix/04_recoverPassword.spec.js +++ b/e2e/paths/01-salix/04_recoverPassword.spec.js @@ -1,7 +1,8 @@ import selectors from '../../helpers/selectors'; import getBrowser from '../../helpers/puppeteer'; -describe('Login path', async() => { +// https://redmine.verdnatura.es/issues/4995 fix login +xdescribe('RecoverPassword path', async() => { let browser; let page; diff --git a/front/salix/components/app/app.html b/front/salix/components/app/app.html index f14fab2dd..d32c9f68b 100644 --- a/front/salix/components/app/app.html +++ b/front/salix/components/app/app.html @@ -1,8 +1,9 @@ - - + diff --git a/front/salix/components/app/app.js b/front/salix/components/app/app.js index 20f0ad969..91a8d2215 100644 --- a/front/salix/components/app/app.js +++ b/front/salix/components/app/app.js @@ -21,7 +21,7 @@ export default class App extends Component { get showLayout() { const state = this.$state.current.name || this.$location.$$path.substring(1).replace('/', '.'); - const outLayout = ['login', 'recoverPassword', 'resetPassword']; + const outLayout = ['login', 'recoverPassword', 'resetPassword', 'reset-password']; return state && !outLayout.some(ol => ol == state); } diff --git a/front/salix/components/login/login.html b/front/salix/components/login/login.html index a078fa0af..807e4b284 100644 --- a/front/salix/components/login/login.html +++ b/front/salix/components/login/login.html @@ -1,27 +1,32 @@ - - - - - - -