hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 11:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix js error on change password (#4475)

Browse Source
This commit is contained in:
Aina Sitraka
2024-02-16 20:15:04 +03:00
committed by GitHub
parent 03ac68bb60
commit c39659630a
14 changed files with 31 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Phraseanet-production-client/config/config.js
View File

@@ -13,5 +13,5 @@ module.exports = {
setupDir: _root + 'tests/setup/node.js', setupDir: _root + 'tests/setup/node.js',
karmaConf: _root + 'config/karma.conf.js', karmaConf: _root + 'config/karma.conf.js',
// change this version when you change JS file for lazy loading // change this version when you change JS file for lazy loading
assetFileVersion: 101 assetFileVersion: 102
}; };

34
Phraseanet-production-client/dist/authenticate.js vendored
View File

@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ if (__webpack_require__.nc) { /******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ } /******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=101"; /******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=102";
/******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete; /******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() { /******/ function onScriptComplete() {
@@ -4558,7 +4558,7 @@ var ErrorView = _backbone2.default.View.extend({
}, },
render: function render() { render: function render() {
if (this.errors.length > 0) { if (this.errors.length > 0) {
var template = _underscore2.default.template((0, _jquery2.default)(this.errorTemplate).html(), { var template = _underscore2.default.template((0, _jquery2.default)(this.errorTemplate).html())({
errors: this.errors errors: this.errors
}); });
@@ -4740,10 +4740,7 @@ var renewPassword = function renewPassword(services) {
}, { }, {
name: 'password[password]', name: 'password[password]',
rules: 'min_length[5]', rules: 'min_length[5]',
message: localeService.t('validation_length_min', { message: localeService.t('validation_length_min')
postProcess: 'sprintf',
sprintf: ['5']
})
}, { }, {
name: 'password[confirm]', name: 'password[confirm]',
rules: 'matches[password[password]]', rules: 'matches[password[password]]',
@@ -4828,10 +4825,7 @@ var regiser = function regiser(services) {
}, { }, {
name: 'password[password]', name: 'password[password]',
rules: 'min_length[5]', rules: 'min_length[5]',
message: localeService.t('validation_length_min', { message: localeService.t('validation_length_min')
postProcess: 'sprintf',
sprintf: ['5']
})
}, { }, {
name: 'password[confirm]', name: 'password[confirm]',
rules: 'matches[password[password]]', rules: 'matches[password[password]]',
@@ -4844,10 +4838,7 @@ var regiser = function regiser(services) {
}, { }, {
name: 'collections[]', name: 'collections[]',
rules: 'min_length[1]', rules: 'min_length[1]',
message: localeService.t('validation_choice_min', { message: localeService.t('validation_choice_min'),
postProcess: 'sprintf',
sprintf: ['1']
}),
type: 'multiple' type: 'multiple'
}]; }];
@@ -4964,10 +4955,7 @@ var registerProvider = function registerProvider(services) {
}, { }, {
name: 'password', name: 'password',
rules: 'min_length[5]', rules: 'min_length[5]',
message: localeService.t('validation_length_min', { message: localeService.t('validation_length_min')
postProcess: 'sprintf',
sprintf: ['5']
})
}, { }, {
name: 'passwordConfirm', name: 'passwordConfirm',
rules: 'matches[password]', rules: 'matches[password]',
@@ -4980,10 +4968,7 @@ var registerProvider = function registerProvider(services) {
}, { }, {
name: 'collections[]', name: 'collections[]',
rules: 'min_length[1]', rules: 'min_length[1]',
message: localeService.t('validation_choice_min', { message: localeService.t('validation_choice_min'),
postProcess: 'sprintf',
sprintf: ['1']
}),
type: 'multiple' type: 'multiple'
}]; }];
@@ -5317,10 +5302,7 @@ var changePassword = function changePassword(services) {
}, { }, {
name: 'password[password]', name: 'password[password]',
rules: 'min_length[5]', rules: 'min_length[5]',
message: localeService.t('validation_length_min', { message: localeService.t('validation_length_min')
postProcess: 'sprintf',
sprintf: ['5']
})
}, { }, {
name: 'password[confirm]', name: 'password[confirm]',
rules: 'matches[password[password]]', rules: 'matches[password[password]]',

34
Phraseanet-production-client/dist/authenticate.min.js vendored
View File

@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ if (__webpack_require__.nc) { /******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ } /******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=101"; /******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=102";
/******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete; /******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() { /******/ function onScriptComplete() {
@@ -4558,7 +4558,7 @@ var ErrorView = _backbone2.default.View.extend({
}, },
render: function render() { render: function render() {
if (this.errors.length > 0) { if (this.errors.length > 0) {
var template = _underscore2.default.template((0, _jquery2.default)(this.errorTemplate).html(), { var template = _underscore2.default.template((0, _jquery2.default)(this.errorTemplate).html())({
errors: this.errors errors: this.errors
}); });
@@ -4740,10 +4740,7 @@ var renewPassword = function renewPassword(services) {
}, { }, {
name: 'password[password]', name: 'password[password]',
rules: 'min_length[5]', rules: 'min_length[5]',
message: localeService.t('validation_length_min', { message: localeService.t('validation_length_min')
postProcess: 'sprintf',
sprintf: ['5']
})
}, { }, {
name: 'password[confirm]', name: 'password[confirm]',
rules: 'matches[password[password]]', rules: 'matches[password[password]]',
@@ -4828,10 +4825,7 @@ var regiser = function regiser(services) {
}, { }, {
name: 'password[password]', name: 'password[password]',
rules: 'min_length[5]', rules: 'min_length[5]',
message: localeService.t('validation_length_min', { message: localeService.t('validation_length_min')
postProcess: 'sprintf',
sprintf: ['5']
})
}, { }, {
name: 'password[confirm]', name: 'password[confirm]',
rules: 'matches[password[password]]', rules: 'matches[password[password]]',
@@ -4844,10 +4838,7 @@ var regiser = function regiser(services) {
}, { }, {
name: 'collections[]', name: 'collections[]',
rules: 'min_length[1]', rules: 'min_length[1]',
message: localeService.t('validation_choice_min', { message: localeService.t('validation_choice_min'),
postProcess: 'sprintf',
sprintf: ['1']
}),
type: 'multiple' type: 'multiple'
}]; }];
@@ -4964,10 +4955,7 @@ var registerProvider = function registerProvider(services) {
}, { }, {
name: 'password', name: 'password',
rules: 'min_length[5]', rules: 'min_length[5]',
message: localeService.t('validation_length_min', { message: localeService.t('validation_length_min')
postProcess: 'sprintf',
sprintf: ['5']
})
}, { }, {
name: 'passwordConfirm', name: 'passwordConfirm',
rules: 'matches[password]', rules: 'matches[password]',
@@ -4980,10 +4968,7 @@ var registerProvider = function registerProvider(services) {
}, { }, {
name: 'collections[]', name: 'collections[]',
rules: 'min_length[1]', rules: 'min_length[1]',
message: localeService.t('validation_choice_min', { message: localeService.t('validation_choice_min'),
postProcess: 'sprintf',
sprintf: ['1']
}),
type: 'multiple' type: 'multiple'
}]; }];
@@ -5317,10 +5302,7 @@ var changePassword = function changePassword(services) {
}, { }, {
name: 'password[password]', name: 'password[password]',
rules: 'min_length[5]', rules: 'min_length[5]',
message: localeService.t('validation_length_min', { message: localeService.t('validation_length_min')
postProcess: 'sprintf',
sprintf: ['5']
})
}, { }, {
name: 'password[confirm]', name: 'password[confirm]',
rules: 'matches[password[password]]', rules: 'matches[password[password]]',

2
Phraseanet-production-client/dist/commons.js vendored
View File

@@ -91,7 +91,7 @@
/******/ if (__webpack_require__.nc) { /******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ } /******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=101"; /******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=102";
/******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete; /******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() { /******/ function onScriptComplete() {

2
Phraseanet-production-client/dist/commons.min.js vendored
View File

@@ -91,7 +91,7 @@
/******/ if (__webpack_require__.nc) { /******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ } /******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=101"; /******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=102";
/******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete; /******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() { /******/ function onScriptComplete() {

5
Phraseanet-production-client/src/components/authentication/changePassword.js
View File

@@ -33,10 +33,7 @@ const changePassword = (services) => {
{ {
name: 'password[password]', name: 'password[password]',
rules: 'min_length[5]', rules: 'min_length[5]',
message: localeService.t('validation_length_min', { message: localeService.t('validation_length_min')
postProcess: 'sprintf',
sprintf: ['5']
})
}, },
{ {
name: 'password[confirm]', name: 'password[confirm]',

2
Phraseanet-production-client/src/components/authentication/common/forms/views/error.js
View File

@@ -31,7 +31,7 @@ var ErrorView = Backbone.View.extend({
}, },
render: function () { render: function () {
if (this.errors.length > 0) { if (this.errors.length > 0) {
var template = _.template($(this.errorTemplate).html(), { var template = _.template($(this.errorTemplate).html())({
errors: this.errors errors: this.errors
}); });

10
Phraseanet-production-client/src/components/authentication/register.js
View File

@@ -47,10 +47,7 @@ const regiser = (services) => {
{ {
name: 'password[password]', name: 'password[password]',
rules: 'min_length[5]', rules: 'min_length[5]',
message: localeService.t('validation_length_min', { message: localeService.t('validation_length_min')
postProcess: 'sprintf',
sprintf: ['5']
})
}, },
{ {
name: 'password[confirm]', name: 'password[confirm]',
@@ -66,10 +63,7 @@ const regiser = (services) => {
{ {
name: 'collections[]', name: 'collections[]',
rules: 'min_length[1]', rules: 'min_length[1]',
message: localeService.t('validation_choice_min', { message: localeService.t('validation_choice_min'),
postProcess: 'sprintf',
sprintf: ['1']
}),
type: 'multiple' type: 'multiple'
} }
]; ];

10
Phraseanet-production-client/src/components/authentication/registerProvider.js
View File

@@ -46,10 +46,7 @@ const registerProvider = (services) => {
{ {
name: 'password', name: 'password',
rules: 'min_length[5]', rules: 'min_length[5]',
message: localeService.t('validation_length_min', { message: localeService.t('validation_length_min')
postProcess: 'sprintf',
sprintf: ['5']
})
}, },
{ {
name: 'passwordConfirm', name: 'passwordConfirm',
@@ -65,10 +62,7 @@ const registerProvider = (services) => {
{ {
name: 'collections[]', name: 'collections[]',
rules: 'min_length[1]', rules: 'min_length[1]',
message: localeService.t('validation_choice_min', { message: localeService.t('validation_choice_min'),
postProcess: 'sprintf',
sprintf: ['1']
}),
type: 'multiple' type: 'multiple'
} }
]; ];

5
Phraseanet-production-client/src/components/authentication/renewPassword.js
View File

@@ -28,10 +28,7 @@ const renewPassword = (services) => {
{ {
name: 'password[password]', name: 'password[password]',
rules: 'min_length[5]', rules: 'min_length[5]',
message: localeService.t('validation_length_min', { message: localeService.t('validation_length_min')
postProcess: 'sprintf',
sprintf: ['5']
})
}, },
{ {
name: 'password[confirm]', name: 'password[confirm]',

4
lib/Alchemy/Phrasea/Controller/Root/LoginController.php
View File

@@ -137,10 +137,10 @@ class LoginController extends Controller
{ {
$response = $this->app->json([ $response = $this->app->json([
'validation_blank' => $this->app->trans('Please provide a value.'), 'validation_blank' => $this->app->trans('Please provide a value.'),
'validation_choice_min' => $this->app->trans('Please select at least %s choice.'), 'validation_choice_min' => $this->app->trans('Please select at least %s choice.', ['%s' => 1]),
'validation_email' => $this->app->trans('Please provide a valid email address.'), 'validation_email' => $this->app->trans('Please provide a valid email address.'),
'validation_ip' => $this->app->trans('Please provide a valid IP address.'), 'validation_ip' => $this->app->trans('Please provide a valid IP address.'),
'validation_length_min' => $this->app->trans('Please provide a longer value. It should have %s character or more.'), 'validation_length_min' => $this->app->trans('Please provide a longer value. It should have %s character or more.', ['%s' => 5]),
'password_match' => $this->app->trans('Please provide the same passwords.'), 'password_match' => $this->app->trans('Please provide the same passwords.'),
'email_match' => $this->app->trans('Please provide the same emails.'), 'email_match' => $this->app->trans('Please provide the same emails.'),
'accept_tou' => $this->app->trans('Please accept the terms of use to register.'), 'accept_tou' => $this->app->trans('Please accept the terms of use to register.'),

2
lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
View File

@@ -62,7 +62,7 @@ class PhraseanetExtension extends \Twig_Extension
{ {
return [ return [
// change this version when you change JS file to force the navigation to reload js file // change this version when you change JS file to force the navigation to reload js file
'assetFileVersion' => 101 'assetFileVersion' => 102
]; ];
} }

2
templates/web/account/change-password.html.twig
View File

@@ -62,7 +62,7 @@
// adapted from http://friendlybit.com/js/lazy-loading-asyncronous-javascript/ // adapted from http://friendlybit.com/js/lazy-loading-asyncronous-javascript/
(function() { (function() {
var ZXCVBN_SRC = 'assets/vendors/zxcvbn/zxcvbn{% if not app.debug %}.min{% endif %}.js'; var ZXCVBN_SRC = '/assets/vendors/zxcvbn/zxcvbn{% if not app.debug %}.min{% endif %}.js';
var async_load = function() { var async_load = function() {
var first, s; var first, s;

2
www/scripts/common/forms/views/error.js
View File

@@ -33,7 +33,7 @@ define([
}, },
render: function () { render: function () {
if (this.errors.length > 0) { if (this.errors.length > 0) {
var template = _.template($(this.errorTemplate).html(), { var template = _.template($(this.errorTemplate).html())({
errors: this.errors errors: this.errors
}); });